Merge pull request #9901 from filecoin-project/gstuart/merge-fevm-into-events

chore: merge fevm into events
2022-12-16 17:24:59 -05:00 · 2022-12-16 17:24:59 -05:00 · 5f4ccfd790
commit 5f4ccfd790
parent 6da93cf921 4ae498a72e
254 changed files with 2535 additions and 1082 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -34,6 +34,10 @@ commands:
        default: false
        description: is a darwin build environment?
        type: boolean
+      darwin-architecture:
+        default: "amd64"
+        description: which darwin architecture is being used?
+        type: string
    steps:
      - checkout
      - git_fetch_all_tags
@ -59,7 +63,7 @@ commands:
            - run:
                name: Install Go
                command: |
-                  curl https://dl.google.com/go/go`cat GO_VERSION_MIN`.darwin-amd64.pkg -o /tmp/go.pkg && \
+                  curl https://dl.google.com/go/go`cat GO_VERSION_MIN`.darwin-<<parameters.darwin-architecture>>.pkg -o /tmp/go.pkg && \
                  sudo installer -pkg /tmp/go.pkg -target /
            - run:
                name: Export Go
@ -276,7 +280,9 @@ jobs:
      - prepare:
          linux: false
          darwin: true
+          darwin-architecture: amd64
      - run: make lotus lotus-miner lotus-worker
+      - run: otool -hv lotus
      - run:
          name: check tag and version output match
          command: ./scripts/version-check.sh ./lotus
@ -298,10 +304,12 @@ jobs:
      - prepare:
          linux: false
          darwin: true
+          darwin-architecture: arm64
      - run: |
          export CPATH=$(brew --prefix)/include
          export LIBRARY_PATH=$(brew --prefix)/lib
          make lotus lotus-miner lotus-worker
+      - run: otool -hv lotus
      - run:
          name: check tag and version output match
          command: ./scripts/version-check.sh ./lotus
@ -586,10 +594,14 @@ jobs:
                  - run:
                      name: Docker push
                      command: |
-                        echo docker push filecoin/<<parameters.image>>:<<parameters.channel>>
+                        docker push filecoin/<<parameters.image>>:<<parameters.channel>>
+                        if [[ ! -z $CIRCLE_SHA ]]; then
+                          docker image tag filecoin/<<parameters.image>>:<<parameters.channel>>> filecoin/<<parameters.image>>:"${CIRCLE_SHA:0:7}"
+                          docker push filecoin/<<parameters.image>>:"${CIRCLE_SHA:0:7}"
+                        fi
                        if [[ ! -z $CIRCLE_TAG ]]; then
                          docker image tag filecoin/<<parameters.image>>:<<parameters.channel>> filecoin/<<parameters.image>>:"${CIRCLE_TAG}"
-                          echo docker push filecoin/<<parameters.image>>:"${CIRCLE_TAG}"
+                          docker push filecoin/<<parameters.image>>:"${CIRCLE_TAG}"
                        fi
            - unless:
                condition: <<parameters.push>>
@ -612,10 +624,14 @@ jobs:
                  - run:
                      name: Docker push
                      command: |
-                        echo docker push filecoin/<<parameters.image>>:<<parameters.channel>>-<<parameters.network>>
+                        docker push filecoin/<<parameters.image>>:<<parameters.channel>>-<<parameters.network>>
+                        if [[ ! -z $CIRCLE_SHA ]]; then
+                          docker image tag filecoin/<<parameters.image>>:<<parameters.channel>>-<<parameters.network>> filecoin/<<parameters.image>>:"${CIRCLE_SHA:0:7}"-<<parameters.network>>
+                          docker push filecoin/<<parameters.image>>:"${CIRCLE_SHA:0:7}"-<<parameters.network>>
+                        fi
                        if [[ ! -z $CIRCLE_TAG ]]; then
                          docker image tag filecoin/<<parameters.image>>:<<parameters.channel>>-<<parameters.network>> filecoin/<<parameters.image>>:"${CIRCLE_TAG}"-<<parameters.network>>
-                          echo docker push filecoin/<<parameters.image>>:"${CIRCLE_TAG}"-<<parameters.network>>
+                          docker push filecoin/<<parameters.image>>:"${CIRCLE_TAG}"-<<parameters.network>>
                        fi
            - unless:
                condition: <<parameters.push>>
@ -748,6 +764,11 @@ workflows:
          suite: itest-dup_mpool_messages
          target: "./itests/dup_mpool_messages_test.go"
      
+      - test:
+          name: test-itest-eth_account_abstraction
+          suite: itest-eth_account_abstraction
+          target: "./itests/eth_account_abstraction_test.go"
+      
      - test:
          name: test-itest-eth_filter
          suite: itest-eth_filter
@ -1147,6 +1168,16 @@ workflows:
            tags:
              only:
                - /^v\d+\.\d+\.\d+-rc\d+$/
+      - build-docker:
+          name: "Docker push (lotus-all-in-one / edge / mainnet)"
+          image: lotus-all-in-one
+          channel: master
+          network: mainnet
+          push: true
+          filters:
+            branches:
+              only:
+                - master
      - build-docker:
          name: "Docker build (lotus-all-in-one / mainnet)"
          image: lotus-all-in-one
@ -1182,6 +1213,16 @@ workflows:
            tags:
              only:
                - /^v\d+\.\d+\.\d+-rc\d+$/
+      - build-docker:
+          name: "Docker push (lotus-all-in-one / edge / butterflynet)"
+          image: lotus-all-in-one
+          channel: master
+          network: butterflynet
+          push: true
+          filters:
+            branches:
+              only:
+                - master
      - build-docker:
          name: "Docker build (lotus-all-in-one / butterflynet)"
          image: lotus-all-in-one
@ -1217,6 +1258,16 @@ workflows:
            tags:
              only:
                - /^v\d+\.\d+\.\d+-rc\d+$/
+      - build-docker:
+          name: "Docker push (lotus-all-in-one / edge / calibnet)"
+          image: lotus-all-in-one
+          channel: master
+          network: calibnet
+          push: true
+          filters:
+            branches:
+              only:
+                - master
      - build-docker:
          name: "Docker build (lotus-all-in-one / calibnet)"
          image: lotus-all-in-one
@ -1252,6 +1303,16 @@ workflows:
            tags:
              only:
                - /^v\d+\.\d+\.\d+-rc\d+$/
+      - build-docker:
+          name: "Docker push (lotus-all-in-one / edge / debug)"
+          image: lotus-all-in-one
+          channel: master
+          network: debug
+          push: true
+          filters:
+            branches:
+              only:
+                - master
      - build-docker:
          name: "Docker build (lotus-all-in-one / debug)"
          image: lotus-all-in-one
@ -1261,6 +1322,51 @@ workflows:
            branches:
              only:
                - /^release\/v\d+\.\d+\.\d+(-rc\d+)?$/
+      - build-docker:
+          name: "Docker push (lotus / stable / mainnet)"
+          image: lotus
+          channel: stable
+          network: mainnet
+          push: true
+          filters:
+            branches:
+              ignore:
+                - /.*/
+            tags:
+              only:
+                - /^v\d+\.\d+\.\d+$/
+      - build-docker:
+          name: "Docker push (lotus / candidate / mainnet)"
+          image: lotus
+          channel: candidate
+          network: mainnet
+          push: true
+          filters:
+            branches:
+              ignore:
+                - /.*/
+            tags:
+              only:
+                - /^v\d+\.\d+\.\d+-rc\d+$/
+      - build-docker:
+          name: "Docker push (lotus / master / mainnet)"
+          image: lotus
+          channel: master
+          network: mainnet
+          push: true
+          filters:
+            branches:
+              only:
+                - master
+      - build-docker:
+          name: "Docker build (lotus / mainnet)"
+          image: lotus
+          network: mainnet
+          push: false
+          filters:
+            branches:
+              only:
+                - /^release\/v\d+\.\d+\.\d+(-rc\d+)?$/

  nightly:
    triggers:
--- a/.circleci/template.yml
+++ b/.circleci/template.yml
@ -34,6 +34,10 @@ commands:
        default: false
        description: is a darwin build environment?
        type: boolean
+      darwin-architecture:
+        default: "amd64"
+        description: which darwin architecture is being used?
+        type: string
    steps:
      - checkout
      - git_fetch_all_tags
@ -59,7 +63,7 @@ commands:
            - run:
                name: Install Go
                command: |
-                  curl https://dl.google.com/go/go`cat GO_VERSION_MIN`.darwin-amd64.pkg -o /tmp/go.pkg && \
+                  curl https://dl.google.com/go/go`cat GO_VERSION_MIN`.darwin-<<parameters.darwin-architecture>>.pkg -o /tmp/go.pkg && \
                  sudo installer -pkg /tmp/go.pkg -target /
            - run:
                name: Export Go
@ -276,7 +280,9 @@ jobs:
      - prepare:
          linux: false
          darwin: true
+          darwin-architecture: amd64
      - run: make lotus lotus-miner lotus-worker
+      - run: otool -hv lotus
      - run:
          name: check tag and version output match
          command: ./scripts/version-check.sh ./lotus
@ -298,10 +304,12 @@ jobs:
      - prepare:
          linux: false
          darwin: true
+          darwin-architecture: arm64
      - run: |
          export CPATH=$(brew --prefix)/include
          export LIBRARY_PATH=$(brew --prefix)/lib
          make lotus lotus-miner lotus-worker
+      - run: otool -hv lotus
      - run:
          name: check tag and version output match
          command: ./scripts/version-check.sh ./lotus
@ -586,10 +594,14 @@ jobs:
                  - run:
                      name: Docker push
                      command: |
-                        echo docker push filecoin/<<parameters.image>>:<<parameters.channel>>
+                        docker push filecoin/<<parameters.image>>:<<parameters.channel>>
+                        if [["[[ ! -z $CIRCLE_SHA ]]"]]; then
+                          docker image tag filecoin/<<parameters.image>>:<<parameters.channel>>> filecoin/<<parameters.image>>:"${CIRCLE_SHA:0:7}"
+                          docker push filecoin/<<parameters.image>>:"${CIRCLE_SHA:0:7}"
+                        fi
                        if [["[[ ! -z $CIRCLE_TAG ]]"]]; then
                          docker image tag filecoin/<<parameters.image>>:<<parameters.channel>> filecoin/<<parameters.image>>:"${CIRCLE_TAG}"
-                          echo docker push filecoin/<<parameters.image>>:"${CIRCLE_TAG}"
+                          docker push filecoin/<<parameters.image>>:"${CIRCLE_TAG}"
                        fi
            - unless:
                condition: <<parameters.push>>
@ -612,10 +624,14 @@ jobs:
                  - run:
                      name: Docker push
                      command: |
-                        echo docker push filecoin/<<parameters.image>>:<<parameters.channel>>-<<parameters.network>>
+                        docker push filecoin/<<parameters.image>>:<<parameters.channel>>-<<parameters.network>>
+                        if [["[[ ! -z $CIRCLE_SHA ]]"]]; then
+                          docker image tag filecoin/<<parameters.image>>:<<parameters.channel>>-<<parameters.network>> filecoin/<<parameters.image>>:"${CIRCLE_SHA:0:7}"-<<parameters.network>>
+                          docker push filecoin/<<parameters.image>>:"${CIRCLE_SHA:0:7}"-<<parameters.network>>
+                        fi
                        if [["[[ ! -z $CIRCLE_TAG ]]"]]; then
                          docker image tag filecoin/<<parameters.image>>:<<parameters.channel>>-<<parameters.network>> filecoin/<<parameters.image>>:"${CIRCLE_TAG}"-<<parameters.network>>
-                          echo docker push filecoin/<<parameters.image>>:"${CIRCLE_TAG}"-<<parameters.network>>
+                          docker push filecoin/<<parameters.image>>:"${CIRCLE_TAG}"-<<parameters.network>>
                        fi
            - unless:
                condition: <<parameters.push>>
@ -798,6 +814,16 @@ workflows:
            tags:
              only:
                - /^v\d+\.\d+\.\d+-rc\d+$/
+      - build-docker:
+          name: "Docker push (lotus-all-in-one / edge / [[.]])"
+          image: lotus-all-in-one
+          channel: master
+          network: [[.]]
+          push: true
+          filters:
+            branches:
+              only:
+                - master
      - build-docker:
          name: "Docker build (lotus-all-in-one / [[.]])"
          image: lotus-all-in-one
@ -808,6 +834,51 @@ workflows:
              only:
                - /^release\/v\d+\.\d+\.\d+(-rc\d+)?$/
      [[- end]]
+      - build-docker:
+          name: "Docker push (lotus / stable / mainnet)"
+          image: lotus
+          channel: stable
+          network: mainnet
+          push: true
+          filters:
+            branches:
+              ignore:
+                - /.*/
+            tags:
+              only:
+                - /^v\d+\.\d+\.\d+$/
+      - build-docker:
+          name: "Docker push (lotus / candidate / mainnet)"
+          image: lotus
+          channel: candidate
+          network: mainnet
+          push: true
+          filters:
+            branches:
+              ignore:
+                - /.*/
+            tags:
+              only:
+                - /^v\d+\.\d+\.\d+-rc\d+$/
+      - build-docker:
+          name: "Docker push (lotus / master / mainnet)"
+          image: lotus
+          channel: master
+          network: mainnet
+          push: true
+          filters:
+            branches:
+              only:
+                - master
+      - build-docker:
+          name: "Docker build (lotus / mainnet)"
+          image: lotus
+          network: mainnet
+          push: false
+          filters:
+            branches:
+              only:
+                - /^release\/v\d+\.\d+\.\d+(-rc\d+)?$/

  nightly:
    triggers:
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@ -65,6 +65,7 @@ archives:
  - id: primary
    format: tar.gz
    wrap_in_directory: true
+    name_template: "{{ .ProjectName }}_v{{ .Version }}_{{ .Os }}_{{ .Arch }}"
    files:
      # this is a dumb but required hack so it doesn't include the default files
      # https://github.com/goreleaser/goreleaser/issues/602
@ -75,7 +76,7 @@ release:
    owner: filecoin-project
    name: lotus
  prerelease: auto
-  name_template: "Release v{{.Version}}"
+  name_template: "v{{.Version}}"

 brews:
  - tap:
@ -105,4 +106,4 @@ checksum:
  disable: true

 snapshot:
-  name_template: "{{ .Tag }}"
+  name_template: "{{ .Version }}"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,176 @@
 # Lotus changelog

+# 1.19.0 / 2022-12-07
+
+This is an optional feature release of Lotus. This feature release includes the SplitStore beta, the experimental Lotus node cluster feature, as well as numerous enhancments and bugfixes.
+
+## Highlights
+### 🟢 SplitStore v2（Beta) 🟢
+
+Splitstore aims to reduce the node performance impact that's caused by the Filecoin's very large, and continuously growing chain datastore by having a hot and cold blockstore. You can find more about the Splitstore implementation [here](https://github.com/filecoin-project/lotus/blob/master/blockstore/splitstore/README.md).
+Splitstore has three basic modes for node operators to configure according to your needs: 
+- `discard`: hotstore only, automatically archive out-of-scope objects that are beyond 4 finalities(3600 epochs).
+- `universal`:  stores all chain data that's beyond 4 finalities into coldstore.
+- `messages`: only stores on-chain messages into coldstore.
+
+The `EnableColdStoreAutoPrune=` configuration is being deprecated in this release, as there is only ever one compaction running. We welcome all node operators to try the new feature and let us know [here](https://github.com/filecoin-project/lotus/discussions/9179) if you have any feedback! 
+There are more configuration one may set, you can read the full documentation about the SplitStoreV2 here: https://lotus.filecoin.io/lotus/configure/splitstore/.
+
+### 🧪 Node Cluster (*EXPERIMENTAL.*) 🧪
+The Lotus HA node cluster feature allows you to run multiple Lotus daemons for the same lotus-miner increasing resiliency. We welcome all Lotus users to join the early testing for this feature and provide your feedback. Please note that this feature is targeted towards more enterprise users of Lotus and requires at least 3 lotus nodes to be set up in a cluster.
+Check out the documentation here: https://lotus.filecoin.io/lotus/configure/clusters/
+
+### ⭐️ SnapDeals Enhancements ⭐️
+Numerous SnapDeals related improvements and fixes made it into this release before the code freeze. Some the highlights of the issues that has been fixed in this feature release are:
+
+- *Unable to snap-up a sector again if something went wrong.* - This has now been fixed ✅
+- *Error messages on loop during an open deadline.* - This has now been fixed ✅
+
+## New features
+- feat:splitstore:single compaction that can handle prune aka two marksets one compaction (#9571) ([filecoin-project/lotus#9571](https://github.com/filecoin-project/lotus/pull/9571))
+   - Introduces a new SplitStore-mode, `messages`, which will only store on-chain messages. Fixes previously issues with regards to `AutoPrune` not compacting the coldstore. [Link to documentation](https://lotus.filecoin.io/lotus/configure/splitstore/)
+- feat: Raft consensus for lotus nodes in a cluster ([filecoin-project/lotus#9294](https://github.com/filecoin-project/lotus/pull/9294))
+   - Adds the experimental node cluster feature.
+- feat: storage: Force exit GenerateSingleVanillaProof on cancelled context ([filecoin-project/lotus#9613](https://github.com/filecoin-project/lotus/pull/9613))
+   - `GenerateSingleVanillaProof` now respects context, which means that it will skip slow to read sectors :snail: and return a context error. Instead of being blocked forever if storage reads where blocked (e.g disconnected NFS).
+- feat: wdpost: Configurable pre-check timeouts ([filecoin-project/lotus#9680](https://github.com/filecoin-project/lotus/pull/9680))
+   - Adds configuration knobs for setting custom amount of time a proving pre-check can take before a sector and partition will be skipped. [Link to documentation](https://lotus.filecoin.io/storage-providers/advanced-configurations/proving/#pre-check-sector-timeout)
+- feat: chain: future proof the from & to address protocols ([filecoin-project/lotus#9515](https://github.com/filecoin-project/lotus/pull/9515))
+   - This lets us add new address protocols to go-address without implicitly accepting them in messages on the network.
+- feat: Retrieval into remote blockstores ([filecoin-project/lotus#9565](https://github.com/filecoin-project/lotus/pull/9565))
+   - Makes it possible to point retrievals at a network-backed blockstore.
+- feat: Add node uptime rpc / output in info command ([filecoin-project/lotus#9436](https://github.com/filecoin-project/lotus/pull/9436))
+   - Adds node uptime stats to the `lotus-miner info` and `lotus info` commands
+- feat: wdpost: Add ability to only have single partition per msg for partitions with… ([filecoin-project/lotus#9413](https://github.com/filecoin-project/lotus/pull/9413))
+  - Adds a configuration option to have a single partition per PoSt Message for partitions containing recovering sectors.
+- feat: miner paramfetch: Don't fetch param files when not needed ([filecoin-project/lotus#9391](https://github.com/filecoin-project/lotus/pull/9391))
+   - A Lotus-Miner processes that has disabled local PoSt / C2 / PR2 does not need the param-files. This makes node startup much faster, reducing downtime by a lot when restarts are needed.
+- feat: client: Add retrieval deal ID and bytes transferred to retrieval output ([filecoin-project/lotus#9398](https://github.com/filecoin-project/lotus/pull/9398))
+   - Appends retrieval deal ID and bytes transferred to the retrieval output.
+- feat: dealpublisher: check for duplicate deals before adding ([filecoin-project/lotus#9365](https://github.com/filecoin-project/lotus/pull/9365))
+- feat: Drop active retrieval check (#764) ([filecoin-project/go-fil-markets#764](https://github.com/filecoin-project/go-fil-markets/pull/764))
+- feat(retrievalmarkets): expose GetDynamicAsk (#748) ([filecoin-project/go-fil-markets#748](https://github.com/filecoin-project/go-fil-markets/pull/748))
+- feat: handle retrieval queries for unindexed identity payload CIDs (#747) ([filecoin-project/go-fil-markets#747](https://github.com/filecoin-project/go-fil-markets/pull/747))
+- feat: add a method for validating an address for a network version (#115) ([filecoin-project/go-state-types#115](https://github.com/filecoin-project/go-state-types/pull/115))
+
+## Improvements
+- fix: miner-cli: Fix lotus-miner proving check ([filecoin-project/lotus#9643](https://github.com/filecoin-project/lotus/pull/9643))
+   - Fixes the issue where the `lotus-miner proving check` command always outputted `Error: rg is nil`
+- fix: sealing pipeline: Clear CreationTime when starting sector upgrade ([filecoin-project/lotus#9642](https://github.com/filecoin-project/lotus/pull/9642))
+   - Fixes the issue where an aborted SnapDeal upgrade could no longer be retried with SnapDeals.
+- fix:sealing-fsm:wait mutable fsm state for immutable sector upgrade error ([filecoin-project/lotus#9598](https://github.com/filecoin-project/lotus/pull/9598))
+   - Creating a new WaitMutable state - now if the deadline is open and the sectors are trying finalize they will wait on the worker until the deadline has closed. Important to note that they will not finalize as soon as the deadline closes, they will wait 1h before continuing. Fixes the previous issue where upgraded Snap-sectors for an open deadline cause a lot of `error-messages` and `p_aux` issues
+- fix: cli: add beneficiary info to lotus-miner actor control list ([filecoin-project/lotus#9632](https://github.com/filecoin-project/lotus/pull/9632))
+   - Adds the beneficiary address to the `lotus-miner actor control list` output.
+- fix: sealing pipeine: Release assigned deals on snapdeals abort ([filecoin-project/lotus#9601](https://github.com/filecoin-project/lotus/pull/9601))
+- fix: docker: make compatible with arm platform ([filecoin-project/lotus#9363](https://github.com/filecoin-project/lotus/pull/9363))
+   - Makes the `Dockerfile.lotus` compatible with ARM-platforms (e.g Mac M1).
+- fix: post worker sched: Don't check worker session in a busy loop ([filecoin-project/lotus#9495](https://github.com/filecoin-project/lotus/pull/9495))
+   - Fixes a looping pattern which could result in a flood of requests between `lotus-miner`<->`lotus-worker`, potentially exhausting resources needed to make http requests, that lead to all sorts of random RPC-related issues.
+- fix: miner: init miner's with 32GiB sectors by default ([filecoin-project/lotus#9364](https://github.com/filecoin-project/lotus/pull/9364))
+   - Makes the `lotus-miner init` defualt to 32GiB sectors.
+- fix: store identity CIDs in CARs for online deals (#749) ([filecoin-project/go-fil-markets#749](https://github.com/filecoin-project/go-fil-markets/pull/749))
+- fix: cliutil: Fix URL-based API endpoint parsing
+
+## Dependencies
+- deps: upgrade go-merkledag to 0.8.1 (#9717)
+- deps: Update go-fil-markets to v1.25.0 ([filecoin-project/lotus#9633](https://github.com/filecoin-project/lotus/pull/9633))
+- deps: upgrade go-merkledag to 0.8.0 ([filecoin-project/lotus#9455](https://github.com/filecoin-project/lotus/pull/9455))
+
+## Others
+- fix/build: Update Zondax/hid to 0.9.1
+- refactor: sealing: minor refactor of FinalizeReplicaUpdate ([filecoin-project/lotus#9614](https://github.com/filecoin-project/lotus/pull/9614))
+- update ffi to 280c4f8b94fd46dc (#9608) ([filecoin-project/lotus#9608](https://github.com/filecoin-project/lotus/pull/9608))
+- fix: tvx: make it work with the FVM ([filecoin-project/lotus#9604](https://github.com/filecoin-project/lotus/pull/9604))
+- fix: autobatch: remove potential deadlock when a block is missing ([filecoin-project/lotus#9602](https://github.com/filecoin-project/lotus/pull/9602))
+- feat: shed: set control address: add dump bytes option ([filecoin-project/lotus#9572](https://github.com/filecoin-project/lotus/pull/9572))
+- feat: shed: Online export-car ([filecoin-project/lotus#9590](https://github.com/filecoin-project/lotus/pull/9590))
+- fix: chain: Update chain.go ([filecoin-project/lotus#9373](https://github.com/filecoin-project/lotus/pull/9373))
+- fix: fvm: Allow setting local bundles for Debug FVM for av 9+ ([filecoin-project/lotus#9509](https://github.com/filecoin-project/lotus/pull/9509))
+- fix: ux: Add outputs to wallet commands ([filecoin-project/lotus#9416](https://github.com/filecoin-project/lotus/pull/9416))
+- fix: ux: specify arg in `net ping` cmd ([filecoin-project/lotus#9459](https://github.com/filecoin-project/lotus/pull/9459))
+- fix: cli: renew --only-cc with sectorfile ([filecoin-project/lotus#9402](https://github.com/filecoin-project/lotus/pull/9402))
+- fix: bstore: Handle codecs correctly in membstore Get ([filecoin-project/lotus#9471](https://github.com/filecoin-project/lotus/pull/9471))
+- fix: not multiplied by the number of seconds ([filecoin-project/lotus#9460](https://github.com/filecoin-project/lotus/pull/9460))
+- Makefile: Drop rarely used binaries from build-devnets (#9513) ([filecoin-project/lotus#9513](https://github.com/filecoin-project/lotus/pull/9513))
+- _ci_ Remove unneeded homebrew deps ([filecoin-project/lotus#9559](https://github.com/filecoin-project/lotus/pull/9559))
+- _ci_: Have apt-get wait until it can get a lock in packer builds ([filecoin-project/lotus#9534](https://github.com/filecoin-project/lotus/pull/9534))
+- _ci_ Appimage go1.18.1 fix ([filecoin-project/lotus#9496](https://github.com/filecoin-project/lotus/pull/9496))
+- _ci_: Fix failing Digital Ocean and Amazon Machine Image release process ([filecoin-project/lotus#9425](https://github.com/filecoin-project/lotus/pull/9425))
+- _ci_: Don't publish new homebrew releases for RC builds ([filecoin-project/lotus#9350](https://github.com/filecoin-project/lotus/pull/9350))
+- _ci_: Use golang 1.18.1 to build appimage ([filecoin-project/lotus#9386](https://github.com/filecoin-project/lotus/pull/9386))
+- _ci_ Refactor release pipeline to better support m1 builds ([filecoin-project/lotus#9600](https://github.com/filecoin-project/lotus/pull/9600))
+- _ci_: Rely on local env varibale instead of context ([filecoin-project/lotus#9740](https://github.com/filecoin-project/lotus/pull/9740))
+- feat: shed: FIP0036 post poll result processing  ([filecoin-project/lotus#9387](https://github.com/filecoin-project/lotus/pull/9387))
+- misc: github: Cleanup PR template ([filecoin-project/lotus#9472](https://github.com/filecoin-project/lotus/pull/9472))
+- docs: release template: Mention codegen in release prep ([filecoin-project/lotus#9430](https://github.com/filecoin-project/lotus/pull/9430))
+- chore: merge releases (v1.17.2) into master ([filecoin-project/lotus#9433](https://github.com/filecoin-project/lotus/pull/9433))
+- chore: merge release/v1.18.0 into master ([filecoin-project/lotus#9597](https://github.com/filecoin-project/lotus/pull/9597))
+- chore:shed: Teach shed/sim to understand --tipset=@nnn notation ([filecoin-project/lotus#9434](https://github.com/filecoin-project/lotus/pull/9434))
+- _chore_: Upgrade `hid` ([filecoin-project/lotus#9406](https://github.com/filecoin-project/lotus/pull/9406))
+- chore: release: Update `release_issue_template` ([filecoin-project/lotus#9150](https://github.com/filecoin-project/lotus/pull/9150))
+- chore: update lotus version to 1.19.0-rc1
+- chore: merge release into master ([filecoin-project/lotus#9657](https://github.com/filecoin-project/lotus/pull/9657))
+- Backport: #9061 rpc errors ([filecoin-project/lotus#9384](https://github.com/filecoin-project/lotus/pull/9384))
+- shed: util: get all msig ([filecoin-project/lotus#9322](https://github.com/filecoin-project/lotus/pull/9322))
+- fix: test: simplify TestDeadlineToggling ([filecoin-project/lotus#9356](https://github.com/filecoin-project/lotus/pull/9356))
+- fix: build: set PropagationDelaySecs correctly ([filecoin-project/lotus#9358](https://github.com/filecoin-project/lotus/pull/9358))
+- fix: test: flaky TestDeadlineToggling around nulls (#9354) ([filecoin-project/lotus#9354](https://github.com/filecoin-project/lotus/pull/9354))
+- fix: retrievals: price-per-byte calculation fix ([filecoin-project/lotus#9353](https://github.com/filecoin-project/lotus/pull/9353))
+- fix: docs: update Go-badge in readme ([filecoin-project/lotus#9347](https://github.com/filecoin-project/lotus/pull/9347))
+- docs: release template: clarify location of version.go ([filecoin-project/lotus#9338](https://github.com/filecoin-project/lotus/pull/9338))
+- build: Bump version to v1.17.3-dev ([filecoin-project/lotus#9337](https://github.com/filecoin-project/lotus/pull/9337))
+- github.com/filecoin-project/go-fil-markets (v1.24.0-v17 -> v1.25.0):
+- Merge branch 'release/v1.24.3'
+- Update ffi and update markets to v9 (#751) (#761) ([filecoin-project/go-fil-markets#761](https://github.com/filecoin-project/go-fil-markets/pull/761))
+- chore: extract Provider piece logic to separate file (#750) ([filecoin-project/go-fil-markets#750](https://github.com/filecoin-project/go-fil-markets/pull/750))
+- Merge branch 'release/v1.24.2'
+- Feat/support custom metadata (#759) ([filecoin-project/go-fil-markets#759](https://github.com/filecoin-project/go-fil-markets/pull/759))
+- Revert "Update ffi and update markets to v9 (#751)" (#755) ([filecoin-project/go-fil-markets#755](https://github.com/filecoin-project/go-fil-markets/pull/755))
+- Update ffi and update markets to v9 (#751) ([filecoin-project/go-fil-markets#751](https://github.com/filecoin-project/go-fil-markets/pull/751))
+- release: v1.24.0 ([filecoin-project/go-fil-markets#745](https://github.com/filecoin-project/go-fil-markets/pull/745))
+- github.com/filecoin-project/go-state-types (v0.9.8 -> v0.9.9):
+
+## lotus-market EOL notice 
+
+As mentioned in [lotus v1.17.0 release notes](https://github.com/filecoin-project/lotus/releases/tag/v1.17.0), markets related features, enhancements and fixes is now lower priority for Lotus. We recommend our users to migrate to other deal making focused software, like [boost](https://boost.filecoin.io/) as soon as possible. That being said, the lotus maintainers will be:
+-  Lotus maintainers will stop supporting lotus-market subcomponent/**storage** deal making related issues or enhancements on Jan 31, 2023.
+- In Q2 2023, we will be deprecating/removing lotus-market related code from this repository.
+
+If you have any questions or concerns, please raise them in [Lotus discussion](https://github.com/filecoin-project/lotus/discussions/categories/market)!
+
+## Contributors
+
+| Contributor | Commits | Lines ± | Files Changed |
+|-------------|---------|---------|---------------|
+| Geoff Stuart | 69 | +4745/-19478 | 405 |
+| Shrenuj Bansal | 39 | +5257/-2183 | 243 |
+| Łukasz Magiera | 32 | +2763/-730 | 169 |
+| Aayush | 47 | +1439/-1138 | 157 |
+| Ian Davis | 21 | +556/-1065 | 41 |
+| Rod Vagg | 5 | +657/-320 | 18 |
+| jennijuju | 4 | +632/-317 | 6 |
+| Aayush Rajasekaran | 13 | +700/-135 | 18 |
+| Jennifer Wang | 14 | +740/-54 | 25 |
+| ZenGround0 | 1 | +193/-195 | 14 |
+| Hannah Howard | 4 | +138/-122 | 52 |
+| Steven Allen | 4 | +105/-24 | 11 |
+| zenground0 | 9 | +109/-16 | 14 |
+| Peter Rabbitson | 1 | +27/-23 | 3 |
+| hannahhoward | 2 | +49/-0 | 2 |
+| Airenas Vaičiūnas | 2 | +31/-16 | 2 |
+| simlecode | 6 | +19/-10 | 12 |
+| Phi | 5 | +16/-10 | 7 |
+| sectrgt | 2 | +18/-0 | 2 |
+| Jiaying Wang | 2 | +4/-4 | 3 |
+| Rob Quist | 1 | +3/-1 | 1 |
+| Jakub Sztandera | 1 | +1/-1 | 1 |
+
+# 1.18.2 / 2022-12-10
+
+This is an OPTIONAL patch release that fixes a recently reported bug, where the miner process crashes due to a panic during an AddPiece process. More details can be found [here](https://github.com/filecoin-project/lotus/pull/9822).
+
+
 # 1.18.1 / 2022-11-28

 This is a small OPTIONAL patch release for the mandatory v1.18.0 release that supports the Filecoin nv17 Shark Upgrade. 
--- a/api/api_full.go
+++ b/api/api_full.go
@ -31,6 +31,7 @@ import (
 	lminer "github.com/filecoin-project/lotus/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/power"
 	"github.com/filecoin-project/lotus/chain/types"
+	"github.com/filecoin-project/lotus/chain/types/ethtypes"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 	"github.com/filecoin-project/lotus/node/repo/imports"
 )
@ -766,60 +767,60 @@ type FullNode interface {
 	// These methods are used for Ethereum-compatible JSON-RPC calls
 	//
 	// EthAccounts will always return [] since we don't expect Lotus to manage private keys
-	EthAccounts(ctx context.Context) ([]EthAddress, error) //perm:read
+	EthAccounts(ctx context.Context) ([]ethtypes.EthAddress, error) //perm:read
 	// EthBlockNumber returns the height of the latest (heaviest) TipSet
-	EthBlockNumber(ctx context.Context) (EthUint64, error) //perm:read
+	EthBlockNumber(ctx context.Context) (ethtypes.EthUint64, error) //perm:read
 	// EthGetBlockTransactionCountByNumber returns the number of messages in the TipSet
-	EthGetBlockTransactionCountByNumber(ctx context.Context, blkNum EthUint64) (EthUint64, error) //perm:read
+	EthGetBlockTransactionCountByNumber(ctx context.Context, blkNum ethtypes.EthUint64) (ethtypes.EthUint64, error) //perm:read
 	// EthGetBlockTransactionCountByHash returns the number of messages in the TipSet
-	EthGetBlockTransactionCountByHash(ctx context.Context, blkHash EthHash) (EthUint64, error) //perm:read
+	EthGetBlockTransactionCountByHash(ctx context.Context, blkHash ethtypes.EthHash) (ethtypes.EthUint64, error) //perm:read

-	EthGetBlockByHash(ctx context.Context, blkHash EthHash, fullTxInfo bool) (EthBlock, error)                      //perm:read
-	EthGetBlockByNumber(ctx context.Context, blkNum string, fullTxInfo bool) (EthBlock, error)                      //perm:read
-	EthGetTransactionByHash(ctx context.Context, txHash *EthHash) (*EthTx, error)                                   //perm:read
-	EthGetTransactionCount(ctx context.Context, sender EthAddress, blkOpt string) (EthUint64, error)                //perm:read
-	EthGetTransactionReceipt(ctx context.Context, txHash EthHash) (*EthTxReceipt, error)                            //perm:read
-	EthGetTransactionByBlockHashAndIndex(ctx context.Context, blkHash EthHash, txIndex EthUint64) (EthTx, error)    //perm:read
-	EthGetTransactionByBlockNumberAndIndex(ctx context.Context, blkNum EthUint64, txIndex EthUint64) (EthTx, error) //perm:read
+	EthGetBlockByHash(ctx context.Context, blkHash ethtypes.EthHash, fullTxInfo bool) (ethtypes.EthBlock, error)                               //perm:read
+	EthGetBlockByNumber(ctx context.Context, blkNum string, fullTxInfo bool) (ethtypes.EthBlock, error)                                        //perm:read
+	EthGetTransactionByHash(ctx context.Context, txHash *ethtypes.EthHash) (*ethtypes.EthTx, error)                                            //perm:read
+	EthGetTransactionCount(ctx context.Context, sender ethtypes.EthAddress, blkOpt string) (ethtypes.EthUint64, error)                         //perm:read
+	EthGetTransactionReceipt(ctx context.Context, txHash ethtypes.EthHash) (*EthTxReceipt, error)                                              //perm:read
+	EthGetTransactionByBlockHashAndIndex(ctx context.Context, blkHash ethtypes.EthHash, txIndex ethtypes.EthUint64) (ethtypes.EthTx, error)    //perm:read
+	EthGetTransactionByBlockNumberAndIndex(ctx context.Context, blkNum ethtypes.EthUint64, txIndex ethtypes.EthUint64) (ethtypes.EthTx, error) //perm:read

-	EthGetCode(ctx context.Context, address EthAddress, blkOpt string) (EthBytes, error)                                         //perm:read
-	EthGetStorageAt(ctx context.Context, address EthAddress, position EthBytes, blkParam string) (EthBytes, error)               //perm:read
-	EthGetBalance(ctx context.Context, address EthAddress, blkParam string) (EthBigInt, error)                                   //perm:read
-	EthChainId(ctx context.Context) (EthUint64, error)                                                                           //perm:read
-	NetVersion(ctx context.Context) (string, error)                                                                              //perm:read
-	NetListening(ctx context.Context) (bool, error)                                                                              //perm:read
-	EthProtocolVersion(ctx context.Context) (EthUint64, error)                                                                   //perm:read
-	EthGasPrice(ctx context.Context) (EthBigInt, error)                                                                          //perm:read
-	EthFeeHistory(ctx context.Context, blkCount EthUint64, newestBlk string, rewardPercentiles []float64) (EthFeeHistory, error) //perm:read
+	EthGetCode(ctx context.Context, address ethtypes.EthAddress, blkOpt string) (ethtypes.EthBytes, error)                                         //perm:read
+	EthGetStorageAt(ctx context.Context, address ethtypes.EthAddress, position ethtypes.EthBytes, blkParam string) (ethtypes.EthBytes, error)      //perm:read
+	EthGetBalance(ctx context.Context, address ethtypes.EthAddress, blkParam string) (ethtypes.EthBigInt, error)                                   //perm:read
+	EthChainId(ctx context.Context) (ethtypes.EthUint64, error)                                                                                    //perm:read
+	NetVersion(ctx context.Context) (string, error)                                                                                                //perm:read
+	NetListening(ctx context.Context) (bool, error)                                                                                                //perm:read
+	EthProtocolVersion(ctx context.Context) (ethtypes.EthUint64, error)                                                                            //perm:read
+	EthGasPrice(ctx context.Context) (ethtypes.EthBigInt, error)                                                                                   //perm:read
+	EthFeeHistory(ctx context.Context, blkCount ethtypes.EthUint64, newestBlk string, rewardPercentiles []float64) (ethtypes.EthFeeHistory, error) //perm:read

-	EthMaxPriorityFeePerGas(ctx context.Context) (EthBigInt, error)             //perm:read
-	EthEstimateGas(ctx context.Context, tx EthCall) (EthUint64, error)          //perm:read
-	EthCall(ctx context.Context, tx EthCall, blkParam string) (EthBytes, error) //perm:read
+	EthMaxPriorityFeePerGas(ctx context.Context) (ethtypes.EthBigInt, error)                      //perm:read
+	EthEstimateGas(ctx context.Context, tx ethtypes.EthCall) (ethtypes.EthUint64, error)          //perm:read
+	EthCall(ctx context.Context, tx ethtypes.EthCall, blkParam string) (ethtypes.EthBytes, error) //perm:read

-	EthSendRawTransaction(ctx context.Context, rawTx EthBytes) (EthHash, error) //perm:read
+	EthSendRawTransaction(ctx context.Context, rawTx ethtypes.EthBytes) (ethtypes.EthHash, error) //perm:read

 	// Returns event logs matching given filter spec.
-	EthGetLogs(ctx context.Context, filter *EthFilterSpec) (*EthFilterResult, error) //perm:read
+	EthGetLogs(ctx context.Context, filter *ethtypes.EthFilterSpec) (*ethtypes.EthFilterResult, error) //perm:read

 	// Polling method for a filter, returns event logs which occurred since last poll.
 	// (requires write perm since timestamp of last filter execution will be written)
-	EthGetFilterChanges(ctx context.Context, id EthFilterID) (*EthFilterResult, error) //perm:write
+	EthGetFilterChanges(ctx context.Context, id ethtypes.EthFilterID) (*ethtypes.EthFilterResult, error) //perm:write

 	// Returns event logs matching filter with given id.
 	// (requires write perm since timestamp of last filter execution will be written)
-	EthGetFilterLogs(ctx context.Context, id EthFilterID) (*EthFilterResult, error) //perm:write
+	EthGetFilterLogs(ctx context.Context, id ethtypes.EthFilterID) (*ethtypes.EthFilterResult, error) //perm:write

 	// Installs a persistent filter based on given filter spec.
-	EthNewFilter(ctx context.Context, filter *EthFilterSpec) (EthFilterID, error) //perm:write
+	EthNewFilter(ctx context.Context, filter *ethtypes.EthFilterSpec) (ethtypes.EthFilterID, error) //perm:write

 	// Installs a persistent filter to notify when a new block arrives.
-	EthNewBlockFilter(ctx context.Context) (EthFilterID, error) //perm:write
+	EthNewBlockFilter(ctx context.Context) (ethtypes.EthFilterID, error) //perm:write

 	// Installs a persistent filter to notify when new messages arrive in the message pool.
-	EthNewPendingTransactionFilter(ctx context.Context) (EthFilterID, error) //perm:write
+	EthNewPendingTransactionFilter(ctx context.Context) (ethtypes.EthFilterID, error) //perm:write

 	// Uninstalls a filter with given id.
-	EthUninstallFilter(ctx context.Context, id EthFilterID) (bool, error) //perm:write
+	EthUninstallFilter(ctx context.Context, id ethtypes.EthFilterID) (bool, error) //perm:write

 	// Subscribe to different event types using websockets
 	// eventTypes is one or more of:
@ -828,10 +829,10 @@ type FullNode interface {
 	//  - logs: notify new event logs that match a criteria
 	// params contains additional parameters used with the log event type
 	// The client will receive a stream of EthSubscriptionResponse values until EthUnsubscribe is called.
-	EthSubscribe(ctx context.Context, eventType string, params *EthSubscriptionParams) (<-chan EthSubscriptionResponse, error) //perm:write
+	EthSubscribe(ctx context.Context, eventType string, params *ethtypes.EthSubscriptionParams) (<-chan ethtypes.EthSubscriptionResponse, error) //perm:write

 	// Unsubscribe from a websocket subscription
-	EthUnsubscribe(ctx context.Context, id EthSubscriptionID) (bool, error) //perm:write
+	EthUnsubscribe(ctx context.Context, id ethtypes.EthSubscriptionID) (bool, error) //perm:write

 	// CreateBackup creates node backup onder the specified file name. The
 	// method requires that the lotus daemon is running with the
@ -1326,3 +1327,23 @@ type PruneOpts struct {
 	MovingGC    bool
 	RetainState int64
 }
+
+type EthTxReceipt struct {
+	TransactionHash  ethtypes.EthHash     `json:"transactionHash"`
+	TransactionIndex ethtypes.EthUint64   `json:"transactionIndex"`
+	BlockHash        ethtypes.EthHash     `json:"blockHash"`
+	BlockNumber      ethtypes.EthUint64   `json:"blockNumber"`
+	From             ethtypes.EthAddress  `json:"from"`
+	To               *ethtypes.EthAddress `json:"to"`
+	// Logs
+	// LogsBloom
+	StateRoot         ethtypes.EthHash     `json:"root"`
+	Status            ethtypes.EthUint64   `json:"status"`
+	ContractAddress   *ethtypes.EthAddress `json:"contractAddress"`
+	CumulativeGasUsed ethtypes.EthUint64   `json:"cumulativeGasUsed"`
+	GasUsed           ethtypes.EthUint64   `json:"gasUsed"`
+	EffectiveGasPrice ethtypes.EthBigInt   `json:"effectiveGasPrice"`
+	LogsBloom         ethtypes.EthBytes    `json:"logsBloom"`
+	Logs              []ethtypes.EthLog    `json:"logs"`
+	Type              ethtypes.EthUint64   `json:"type"`
+}
--- a/api/docgen/docgen.go
+++ b/api/docgen/docgen.go
@ -43,6 +43,7 @@ import (
 	"github.com/filecoin-project/lotus/api/v0api"
 	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/types"
+	"github.com/filecoin-project/lotus/chain/types/ethtypes"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 	"github.com/filecoin-project/lotus/node/repo/imports"
 	sealing "github.com/filecoin-project/lotus/storage/pipeline"
@ -372,30 +373,30 @@ func init() {
 		},
 	})

-	ethint := api.EthUint64(5)
+	ethint := ethtypes.EthUint64(5)

 	addExample(ethint)
 	addExample(&ethint)
-	ethaddr, _ := api.EthAddressFromHex("0x5CbEeCF99d3fDB3f25E309Cc264f240bb0664031")
+	ethaddr, _ := ethtypes.EthAddressFromHex("0x5CbEeCF99d3fDB3f25E309Cc264f240bb0664031")
 	addExample(&ethaddr)
-	ethhash, _ := api.NewEthHashFromCid(c)
+	ethhash, _ := ethtypes.NewEthHashFromCid(c)
 	addExample(&ethhash)

-	ethFeeHistoryReward := [][]api.EthBigInt{}
+	ethFeeHistoryReward := [][]ethtypes.EthBigInt{}
 	addExample(&ethFeeHistoryReward)

 	addExample(&uuid.UUID{})

-	filterid, _ := api.EthHashFromHex("0x5CbEeC012345673f25E309Cc264f240bb0664031")
-	addExample(api.EthFilterID(filterid))
+	filterid, _ := ethtypes.EthHashFromHex("0x5CbEeC012345673f25E309Cc264f240bb0664031")
+	addExample(ethtypes.EthFilterID(filterid))

-	subid, _ := api.EthHashFromHex("0x5CbEeCF99d3fDB301234567c264f240bb0664031")
-	addExample(api.EthSubscriptionID(subid))
+	subid, _ := ethtypes.EthHashFromHex("0x5CbEeCF99d3fDB301234567c264f240bb0664031")
+	addExample(ethtypes.EthSubscriptionID(subid))

 	pstring := func(s string) *string { return &s }
-	addExample(&api.EthFilterSpec{
+	addExample(&ethtypes.EthFilterSpec{
 		FromBlock: pstring("2301220"),
-		Address:   []api.EthAddress{ethaddr},
+		Address:   []ethtypes.EthAddress{ethaddr},
 	})
 }

--- a/api/mocks/mock_full.go
+++ b/api/mocks/mock_full.go
@ -37,6 +37,7 @@ import (
 	apitypes "github.com/filecoin-project/lotus/api/types"
 	miner0 "github.com/filecoin-project/lotus/chain/actors/builtin/miner"
 	types "github.com/filecoin-project/lotus/chain/types"
+	ethtypes "github.com/filecoin-project/lotus/chain/types/ethtypes"
 	alerting "github.com/filecoin-project/lotus/journal/alerting"
 	dtypes "github.com/filecoin-project/lotus/node/modules/dtypes"
 	imports "github.com/filecoin-project/lotus/node/repo/imports"
@ -937,10 +938,10 @@ func (mr *MockFullNodeMockRecorder) Discover(arg0 interface{}) *gomock.Call {
 }

 // EthAccounts mocks base method.
-func (m *MockFullNode) EthAccounts(arg0 context.Context) ([]api.EthAddress, error) {
+func (m *MockFullNode) EthAccounts(arg0 context.Context) ([]ethtypes.EthAddress, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthAccounts", arg0)
-	ret0, _ := ret[0].([]api.EthAddress)
+	ret0, _ := ret[0].([]ethtypes.EthAddress)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -952,10 +953,10 @@ func (mr *MockFullNodeMockRecorder) EthAccounts(arg0 interface{}) *gomock.Call {
 }

 // EthBlockNumber mocks base method.
-func (m *MockFullNode) EthBlockNumber(arg0 context.Context) (api.EthUint64, error) {
+func (m *MockFullNode) EthBlockNumber(arg0 context.Context) (ethtypes.EthUint64, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthBlockNumber", arg0)
-	ret0, _ := ret[0].(api.EthUint64)
+	ret0, _ := ret[0].(ethtypes.EthUint64)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -967,10 +968,10 @@ func (mr *MockFullNodeMockRecorder) EthBlockNumber(arg0 interface{}) *gomock.Cal
 }

 // EthCall mocks base method.
-func (m *MockFullNode) EthCall(arg0 context.Context, arg1 api.EthCall, arg2 string) (api.EthBytes, error) {
+func (m *MockFullNode) EthCall(arg0 context.Context, arg1 ethtypes.EthCall, arg2 string) (ethtypes.EthBytes, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthCall", arg0, arg1, arg2)
-	ret0, _ := ret[0].(api.EthBytes)
+	ret0, _ := ret[0].(ethtypes.EthBytes)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -982,10 +983,10 @@ func (mr *MockFullNodeMockRecorder) EthCall(arg0, arg1, arg2 interface{}) *gomoc
 }

 // EthChainId mocks base method.
-func (m *MockFullNode) EthChainId(arg0 context.Context) (api.EthUint64, error) {
+func (m *MockFullNode) EthChainId(arg0 context.Context) (ethtypes.EthUint64, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthChainId", arg0)
-	ret0, _ := ret[0].(api.EthUint64)
+	ret0, _ := ret[0].(ethtypes.EthUint64)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -997,10 +998,10 @@ func (mr *MockFullNodeMockRecorder) EthChainId(arg0 interface{}) *gomock.Call {
 }

 // EthEstimateGas mocks base method.
-func (m *MockFullNode) EthEstimateGas(arg0 context.Context, arg1 api.EthCall) (api.EthUint64, error) {
+func (m *MockFullNode) EthEstimateGas(arg0 context.Context, arg1 ethtypes.EthCall) (ethtypes.EthUint64, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthEstimateGas", arg0, arg1)
-	ret0, _ := ret[0].(api.EthUint64)
+	ret0, _ := ret[0].(ethtypes.EthUint64)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1012,10 +1013,10 @@ func (mr *MockFullNodeMockRecorder) EthEstimateGas(arg0, arg1 interface{}) *gomo
 }

 // EthFeeHistory mocks base method.
-func (m *MockFullNode) EthFeeHistory(arg0 context.Context, arg1 api.EthUint64, arg2 string, arg3 []float64) (api.EthFeeHistory, error) {
+func (m *MockFullNode) EthFeeHistory(arg0 context.Context, arg1 ethtypes.EthUint64, arg2 string, arg3 []float64) (ethtypes.EthFeeHistory, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthFeeHistory", arg0, arg1, arg2, arg3)
-	ret0, _ := ret[0].(api.EthFeeHistory)
+	ret0, _ := ret[0].(ethtypes.EthFeeHistory)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1027,10 +1028,10 @@ func (mr *MockFullNodeMockRecorder) EthFeeHistory(arg0, arg1, arg2, arg3 interfa
 }

 // EthGasPrice mocks base method.
-func (m *MockFullNode) EthGasPrice(arg0 context.Context) (api.EthBigInt, error) {
+func (m *MockFullNode) EthGasPrice(arg0 context.Context) (ethtypes.EthBigInt, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthGasPrice", arg0)
-	ret0, _ := ret[0].(api.EthBigInt)
+	ret0, _ := ret[0].(ethtypes.EthBigInt)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1042,10 +1043,10 @@ func (mr *MockFullNodeMockRecorder) EthGasPrice(arg0 interface{}) *gomock.Call {
 }

 // EthGetBalance mocks base method.
-func (m *MockFullNode) EthGetBalance(arg0 context.Context, arg1 api.EthAddress, arg2 string) (api.EthBigInt, error) {
+func (m *MockFullNode) EthGetBalance(arg0 context.Context, arg1 ethtypes.EthAddress, arg2 string) (ethtypes.EthBigInt, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthGetBalance", arg0, arg1, arg2)
-	ret0, _ := ret[0].(api.EthBigInt)
+	ret0, _ := ret[0].(ethtypes.EthBigInt)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1057,10 +1058,10 @@ func (mr *MockFullNodeMockRecorder) EthGetBalance(arg0, arg1, arg2 interface{})
 }

 // EthGetBlockByHash mocks base method.
-func (m *MockFullNode) EthGetBlockByHash(arg0 context.Context, arg1 api.EthHash, arg2 bool) (api.EthBlock, error) {
+func (m *MockFullNode) EthGetBlockByHash(arg0 context.Context, arg1 ethtypes.EthHash, arg2 bool) (ethtypes.EthBlock, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthGetBlockByHash", arg0, arg1, arg2)
-	ret0, _ := ret[0].(api.EthBlock)
+	ret0, _ := ret[0].(ethtypes.EthBlock)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1072,10 +1073,10 @@ func (mr *MockFullNodeMockRecorder) EthGetBlockByHash(arg0, arg1, arg2 interface
 }

 // EthGetBlockByNumber mocks base method.
-func (m *MockFullNode) EthGetBlockByNumber(arg0 context.Context, arg1 string, arg2 bool) (api.EthBlock, error) {
+func (m *MockFullNode) EthGetBlockByNumber(arg0 context.Context, arg1 string, arg2 bool) (ethtypes.EthBlock, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthGetBlockByNumber", arg0, arg1, arg2)
-	ret0, _ := ret[0].(api.EthBlock)
+	ret0, _ := ret[0].(ethtypes.EthBlock)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1087,10 +1088,10 @@ func (mr *MockFullNodeMockRecorder) EthGetBlockByNumber(arg0, arg1, arg2 interfa
 }

 // EthGetBlockTransactionCountByHash mocks base method.
-func (m *MockFullNode) EthGetBlockTransactionCountByHash(arg0 context.Context, arg1 api.EthHash) (api.EthUint64, error) {
+func (m *MockFullNode) EthGetBlockTransactionCountByHash(arg0 context.Context, arg1 ethtypes.EthHash) (ethtypes.EthUint64, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthGetBlockTransactionCountByHash", arg0, arg1)
-	ret0, _ := ret[0].(api.EthUint64)
+	ret0, _ := ret[0].(ethtypes.EthUint64)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1102,10 +1103,10 @@ func (mr *MockFullNodeMockRecorder) EthGetBlockTransactionCountByHash(arg0, arg1
 }

 // EthGetBlockTransactionCountByNumber mocks base method.
-func (m *MockFullNode) EthGetBlockTransactionCountByNumber(arg0 context.Context, arg1 api.EthUint64) (api.EthUint64, error) {
+func (m *MockFullNode) EthGetBlockTransactionCountByNumber(arg0 context.Context, arg1 ethtypes.EthUint64) (ethtypes.EthUint64, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthGetBlockTransactionCountByNumber", arg0, arg1)
-	ret0, _ := ret[0].(api.EthUint64)
+	ret0, _ := ret[0].(ethtypes.EthUint64)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1117,10 +1118,10 @@ func (mr *MockFullNodeMockRecorder) EthGetBlockTransactionCountByNumber(arg0, ar
 }

 // EthGetCode mocks base method.
-func (m *MockFullNode) EthGetCode(arg0 context.Context, arg1 api.EthAddress, arg2 string) (api.EthBytes, error) {
+func (m *MockFullNode) EthGetCode(arg0 context.Context, arg1 ethtypes.EthAddress, arg2 string) (ethtypes.EthBytes, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthGetCode", arg0, arg1, arg2)
-	ret0, _ := ret[0].(api.EthBytes)
+	ret0, _ := ret[0].(ethtypes.EthBytes)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1132,10 +1133,10 @@ func (mr *MockFullNodeMockRecorder) EthGetCode(arg0, arg1, arg2 interface{}) *go
 }

 // EthGetFilterChanges mocks base method.
-func (m *MockFullNode) EthGetFilterChanges(arg0 context.Context, arg1 api.EthFilterID) (*api.EthFilterResult, error) {
+func (m *MockFullNode) EthGetFilterChanges(arg0 context.Context, arg1 ethtypes.EthFilterID) (*ethtypes.EthFilterResult, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthGetFilterChanges", arg0, arg1)
-	ret0, _ := ret[0].(*api.EthFilterResult)
+	ret0, _ := ret[0].(*ethtypes.EthFilterResult)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1147,10 +1148,10 @@ func (mr *MockFullNodeMockRecorder) EthGetFilterChanges(arg0, arg1 interface{})
 }

 // EthGetFilterLogs mocks base method.
-func (m *MockFullNode) EthGetFilterLogs(arg0 context.Context, arg1 api.EthFilterID) (*api.EthFilterResult, error) {
+func (m *MockFullNode) EthGetFilterLogs(arg0 context.Context, arg1 ethtypes.EthFilterID) (*ethtypes.EthFilterResult, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthGetFilterLogs", arg0, arg1)
-	ret0, _ := ret[0].(*api.EthFilterResult)
+	ret0, _ := ret[0].(*ethtypes.EthFilterResult)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1162,10 +1163,10 @@ func (mr *MockFullNodeMockRecorder) EthGetFilterLogs(arg0, arg1 interface{}) *go
 }

 // EthGetLogs mocks base method.
-func (m *MockFullNode) EthGetLogs(arg0 context.Context, arg1 *api.EthFilterSpec) (*api.EthFilterResult, error) {
+func (m *MockFullNode) EthGetLogs(arg0 context.Context, arg1 *ethtypes.EthFilterSpec) (*ethtypes.EthFilterResult, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthGetLogs", arg0, arg1)
-	ret0, _ := ret[0].(*api.EthFilterResult)
+	ret0, _ := ret[0].(*ethtypes.EthFilterResult)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1177,10 +1178,10 @@ func (mr *MockFullNodeMockRecorder) EthGetLogs(arg0, arg1 interface{}) *gomock.C
 }

 // EthGetStorageAt mocks base method.
-func (m *MockFullNode) EthGetStorageAt(arg0 context.Context, arg1 api.EthAddress, arg2 api.EthBytes, arg3 string) (api.EthBytes, error) {
+func (m *MockFullNode) EthGetStorageAt(arg0 context.Context, arg1 ethtypes.EthAddress, arg2 ethtypes.EthBytes, arg3 string) (ethtypes.EthBytes, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthGetStorageAt", arg0, arg1, arg2, arg3)
-	ret0, _ := ret[0].(api.EthBytes)
+	ret0, _ := ret[0].(ethtypes.EthBytes)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1192,10 +1193,10 @@ func (mr *MockFullNodeMockRecorder) EthGetStorageAt(arg0, arg1, arg2, arg3 inter
 }

 // EthGetTransactionByBlockHashAndIndex mocks base method.
-func (m *MockFullNode) EthGetTransactionByBlockHashAndIndex(arg0 context.Context, arg1 api.EthHash, arg2 api.EthUint64) (api.EthTx, error) {
+func (m *MockFullNode) EthGetTransactionByBlockHashAndIndex(arg0 context.Context, arg1 ethtypes.EthHash, arg2 ethtypes.EthUint64) (ethtypes.EthTx, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthGetTransactionByBlockHashAndIndex", arg0, arg1, arg2)
-	ret0, _ := ret[0].(api.EthTx)
+	ret0, _ := ret[0].(ethtypes.EthTx)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1207,10 +1208,10 @@ func (mr *MockFullNodeMockRecorder) EthGetTransactionByBlockHashAndIndex(arg0, a
 }

 // EthGetTransactionByBlockNumberAndIndex mocks base method.
-func (m *MockFullNode) EthGetTransactionByBlockNumberAndIndex(arg0 context.Context, arg1, arg2 api.EthUint64) (api.EthTx, error) {
+func (m *MockFullNode) EthGetTransactionByBlockNumberAndIndex(arg0 context.Context, arg1, arg2 ethtypes.EthUint64) (ethtypes.EthTx, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthGetTransactionByBlockNumberAndIndex", arg0, arg1, arg2)
-	ret0, _ := ret[0].(api.EthTx)
+	ret0, _ := ret[0].(ethtypes.EthTx)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1222,10 +1223,10 @@ func (mr *MockFullNodeMockRecorder) EthGetTransactionByBlockNumberAndIndex(arg0,
 }

 // EthGetTransactionByHash mocks base method.
-func (m *MockFullNode) EthGetTransactionByHash(arg0 context.Context, arg1 *api.EthHash) (*api.EthTx, error) {
+func (m *MockFullNode) EthGetTransactionByHash(arg0 context.Context, arg1 *ethtypes.EthHash) (*ethtypes.EthTx, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthGetTransactionByHash", arg0, arg1)
-	ret0, _ := ret[0].(*api.EthTx)
+	ret0, _ := ret[0].(*ethtypes.EthTx)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1237,10 +1238,10 @@ func (mr *MockFullNodeMockRecorder) EthGetTransactionByHash(arg0, arg1 interface
 }

 // EthGetTransactionCount mocks base method.
-func (m *MockFullNode) EthGetTransactionCount(arg0 context.Context, arg1 api.EthAddress, arg2 string) (api.EthUint64, error) {
+func (m *MockFullNode) EthGetTransactionCount(arg0 context.Context, arg1 ethtypes.EthAddress, arg2 string) (ethtypes.EthUint64, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthGetTransactionCount", arg0, arg1, arg2)
-	ret0, _ := ret[0].(api.EthUint64)
+	ret0, _ := ret[0].(ethtypes.EthUint64)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1252,7 +1253,7 @@ func (mr *MockFullNodeMockRecorder) EthGetTransactionCount(arg0, arg1, arg2 inte
 }

 // EthGetTransactionReceipt mocks base method.
-func (m *MockFullNode) EthGetTransactionReceipt(arg0 context.Context, arg1 api.EthHash) (*api.EthTxReceipt, error) {
+func (m *MockFullNode) EthGetTransactionReceipt(arg0 context.Context, arg1 ethtypes.EthHash) (*api.EthTxReceipt, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthGetTransactionReceipt", arg0, arg1)
 	ret0, _ := ret[0].(*api.EthTxReceipt)
@ -1267,10 +1268,10 @@ func (mr *MockFullNodeMockRecorder) EthGetTransactionReceipt(arg0, arg1 interfac
 }

 // EthMaxPriorityFeePerGas mocks base method.
-func (m *MockFullNode) EthMaxPriorityFeePerGas(arg0 context.Context) (api.EthBigInt, error) {
+func (m *MockFullNode) EthMaxPriorityFeePerGas(arg0 context.Context) (ethtypes.EthBigInt, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthMaxPriorityFeePerGas", arg0)
-	ret0, _ := ret[0].(api.EthBigInt)
+	ret0, _ := ret[0].(ethtypes.EthBigInt)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1282,10 +1283,10 @@ func (mr *MockFullNodeMockRecorder) EthMaxPriorityFeePerGas(arg0 interface{}) *g
 }

 // EthNewBlockFilter mocks base method.
-func (m *MockFullNode) EthNewBlockFilter(arg0 context.Context) (api.EthFilterID, error) {
+func (m *MockFullNode) EthNewBlockFilter(arg0 context.Context) (ethtypes.EthFilterID, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthNewBlockFilter", arg0)
-	ret0, _ := ret[0].(api.EthFilterID)
+	ret0, _ := ret[0].(ethtypes.EthFilterID)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1297,10 +1298,10 @@ func (mr *MockFullNodeMockRecorder) EthNewBlockFilter(arg0 interface{}) *gomock.
 }

 // EthNewFilter mocks base method.
-func (m *MockFullNode) EthNewFilter(arg0 context.Context, arg1 *api.EthFilterSpec) (api.EthFilterID, error) {
+func (m *MockFullNode) EthNewFilter(arg0 context.Context, arg1 *ethtypes.EthFilterSpec) (ethtypes.EthFilterID, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthNewFilter", arg0, arg1)
-	ret0, _ := ret[0].(api.EthFilterID)
+	ret0, _ := ret[0].(ethtypes.EthFilterID)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1312,10 +1313,10 @@ func (mr *MockFullNodeMockRecorder) EthNewFilter(arg0, arg1 interface{}) *gomock
 }

 // EthNewPendingTransactionFilter mocks base method.
-func (m *MockFullNode) EthNewPendingTransactionFilter(arg0 context.Context) (api.EthFilterID, error) {
+func (m *MockFullNode) EthNewPendingTransactionFilter(arg0 context.Context) (ethtypes.EthFilterID, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthNewPendingTransactionFilter", arg0)
-	ret0, _ := ret[0].(api.EthFilterID)
+	ret0, _ := ret[0].(ethtypes.EthFilterID)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1327,10 +1328,10 @@ func (mr *MockFullNodeMockRecorder) EthNewPendingTransactionFilter(arg0 interfac
 }

 // EthProtocolVersion mocks base method.
-func (m *MockFullNode) EthProtocolVersion(arg0 context.Context) (api.EthUint64, error) {
+func (m *MockFullNode) EthProtocolVersion(arg0 context.Context) (ethtypes.EthUint64, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthProtocolVersion", arg0)
-	ret0, _ := ret[0].(api.EthUint64)
+	ret0, _ := ret[0].(ethtypes.EthUint64)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1342,10 +1343,10 @@ func (mr *MockFullNodeMockRecorder) EthProtocolVersion(arg0 interface{}) *gomock
 }

 // EthSendRawTransaction mocks base method.
-func (m *MockFullNode) EthSendRawTransaction(arg0 context.Context, arg1 api.EthBytes) (api.EthHash, error) {
+func (m *MockFullNode) EthSendRawTransaction(arg0 context.Context, arg1 ethtypes.EthBytes) (ethtypes.EthHash, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthSendRawTransaction", arg0, arg1)
-	ret0, _ := ret[0].(api.EthHash)
+	ret0, _ := ret[0].(ethtypes.EthHash)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1357,10 +1358,10 @@ func (mr *MockFullNodeMockRecorder) EthSendRawTransaction(arg0, arg1 interface{}
 }

 // EthSubscribe mocks base method.
-func (m *MockFullNode) EthSubscribe(arg0 context.Context, arg1 string, arg2 *api.EthSubscriptionParams) (<-chan api.EthSubscriptionResponse, error) {
+func (m *MockFullNode) EthSubscribe(arg0 context.Context, arg1 string, arg2 *ethtypes.EthSubscriptionParams) (<-chan ethtypes.EthSubscriptionResponse, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthSubscribe", arg0, arg1, arg2)
-	ret0, _ := ret[0].(<-chan api.EthSubscriptionResponse)
+	ret0, _ := ret[0].(<-chan ethtypes.EthSubscriptionResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -1372,7 +1373,7 @@ func (mr *MockFullNodeMockRecorder) EthSubscribe(arg0, arg1, arg2 interface{}) *
 }

 // EthUninstallFilter mocks base method.
-func (m *MockFullNode) EthUninstallFilter(arg0 context.Context, arg1 api.EthFilterID) (bool, error) {
+func (m *MockFullNode) EthUninstallFilter(arg0 context.Context, arg1 ethtypes.EthFilterID) (bool, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthUninstallFilter", arg0, arg1)
 	ret0, _ := ret[0].(bool)
@ -1387,7 +1388,7 @@ func (mr *MockFullNodeMockRecorder) EthUninstallFilter(arg0, arg1 interface{}) *
 }

 // EthUnsubscribe mocks base method.
-func (m *MockFullNode) EthUnsubscribe(arg0 context.Context, arg1 api.EthSubscriptionID) (bool, error) {
+func (m *MockFullNode) EthUnsubscribe(arg0 context.Context, arg1 ethtypes.EthSubscriptionID) (bool, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "EthUnsubscribe", arg0, arg1)
 	ret0, _ := ret[0].(bool)
--- a/api/proxy_gen.go
+++ b/api/proxy_gen.go
@ -36,8 +36,8 @@ import (
 	builtinactors "github.com/filecoin-project/lotus/chain/actors/builtin"
 	lminer "github.com/filecoin-project/lotus/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lotus/chain/types"
+	"github.com/filecoin-project/lotus/chain/types/ethtypes"
 	"github.com/filecoin-project/lotus/journal/alerting"
-	_ "github.com/filecoin-project/lotus/lib/sigs/delegated"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 	"github.com/filecoin-project/lotus/node/repo/imports"
 	"github.com/filecoin-project/lotus/storage/pipeline/sealiface"
@ -221,67 +221,67 @@ type FullNodeStruct struct {

 		CreateBackup func(p0 context.Context, p1 string) error `perm:"admin"`

-		EthAccounts func(p0 context.Context) ([]EthAddress, error) `perm:"read"`
+		EthAccounts func(p0 context.Context) ([]ethtypes.EthAddress, error) `perm:"read"`

-		EthBlockNumber func(p0 context.Context) (EthUint64, error) `perm:"read"`
+		EthBlockNumber func(p0 context.Context) (ethtypes.EthUint64, error) `perm:"read"`

-		EthCall func(p0 context.Context, p1 EthCall, p2 string) (EthBytes, error) `perm:"read"`
+		EthCall func(p0 context.Context, p1 ethtypes.EthCall, p2 string) (ethtypes.EthBytes, error) `perm:"read"`

-		EthChainId func(p0 context.Context) (EthUint64, error) `perm:"read"`
+		EthChainId func(p0 context.Context) (ethtypes.EthUint64, error) `perm:"read"`

-		EthEstimateGas func(p0 context.Context, p1 EthCall) (EthUint64, error) `perm:"read"`
+		EthEstimateGas func(p0 context.Context, p1 ethtypes.EthCall) (ethtypes.EthUint64, error) `perm:"read"`

-		EthFeeHistory func(p0 context.Context, p1 EthUint64, p2 string, p3 []float64) (EthFeeHistory, error) `perm:"read"`
+		EthFeeHistory func(p0 context.Context, p1 ethtypes.EthUint64, p2 string, p3 []float64) (ethtypes.EthFeeHistory, error) `perm:"read"`

-		EthGasPrice func(p0 context.Context) (EthBigInt, error) `perm:"read"`
+		EthGasPrice func(p0 context.Context) (ethtypes.EthBigInt, error) `perm:"read"`

-		EthGetBalance func(p0 context.Context, p1 EthAddress, p2 string) (EthBigInt, error) `perm:"read"`
+		EthGetBalance func(p0 context.Context, p1 ethtypes.EthAddress, p2 string) (ethtypes.EthBigInt, error) `perm:"read"`

-		EthGetBlockByHash func(p0 context.Context, p1 EthHash, p2 bool) (EthBlock, error) `perm:"read"`
+		EthGetBlockByHash func(p0 context.Context, p1 ethtypes.EthHash, p2 bool) (ethtypes.EthBlock, error) `perm:"read"`

-		EthGetBlockByNumber func(p0 context.Context, p1 string, p2 bool) (EthBlock, error) `perm:"read"`
+		EthGetBlockByNumber func(p0 context.Context, p1 string, p2 bool) (ethtypes.EthBlock, error) `perm:"read"`

-		EthGetBlockTransactionCountByHash func(p0 context.Context, p1 EthHash) (EthUint64, error) `perm:"read"`
+		EthGetBlockTransactionCountByHash func(p0 context.Context, p1 ethtypes.EthHash) (ethtypes.EthUint64, error) `perm:"read"`

-		EthGetBlockTransactionCountByNumber func(p0 context.Context, p1 EthUint64) (EthUint64, error) `perm:"read"`
+		EthGetBlockTransactionCountByNumber func(p0 context.Context, p1 ethtypes.EthUint64) (ethtypes.EthUint64, error) `perm:"read"`

-		EthGetCode func(p0 context.Context, p1 EthAddress, p2 string) (EthBytes, error) `perm:"read"`
+		EthGetCode func(p0 context.Context, p1 ethtypes.EthAddress, p2 string) (ethtypes.EthBytes, error) `perm:"read"`

-		EthGetFilterChanges func(p0 context.Context, p1 EthFilterID) (*EthFilterResult, error) `perm:"write"`
+		EthGetFilterChanges func(p0 context.Context, p1 ethtypes.EthFilterID) (*ethtypes.EthFilterResult, error) `perm:"write"`

-		EthGetFilterLogs func(p0 context.Context, p1 EthFilterID) (*EthFilterResult, error) `perm:"write"`
+		EthGetFilterLogs func(p0 context.Context, p1 ethtypes.EthFilterID) (*ethtypes.EthFilterResult, error) `perm:"write"`

-		EthGetLogs func(p0 context.Context, p1 *EthFilterSpec) (*EthFilterResult, error) `perm:"read"`
+		EthGetLogs func(p0 context.Context, p1 *ethtypes.EthFilterSpec) (*ethtypes.EthFilterResult, error) `perm:"read"`

-		EthGetStorageAt func(p0 context.Context, p1 EthAddress, p2 EthBytes, p3 string) (EthBytes, error) `perm:"read"`
+		EthGetStorageAt func(p0 context.Context, p1 ethtypes.EthAddress, p2 ethtypes.EthBytes, p3 string) (ethtypes.EthBytes, error) `perm:"read"`

-		EthGetTransactionByBlockHashAndIndex func(p0 context.Context, p1 EthHash, p2 EthUint64) (EthTx, error) `perm:"read"`
+		EthGetTransactionByBlockHashAndIndex func(p0 context.Context, p1 ethtypes.EthHash, p2 ethtypes.EthUint64) (ethtypes.EthTx, error) `perm:"read"`

-		EthGetTransactionByBlockNumberAndIndex func(p0 context.Context, p1 EthUint64, p2 EthUint64) (EthTx, error) `perm:"read"`
+		EthGetTransactionByBlockNumberAndIndex func(p0 context.Context, p1 ethtypes.EthUint64, p2 ethtypes.EthUint64) (ethtypes.EthTx, error) `perm:"read"`

-		EthGetTransactionByHash func(p0 context.Context, p1 *EthHash) (*EthTx, error) `perm:"read"`
+		EthGetTransactionByHash func(p0 context.Context, p1 *ethtypes.EthHash) (*ethtypes.EthTx, error) `perm:"read"`

-		EthGetTransactionCount func(p0 context.Context, p1 EthAddress, p2 string) (EthUint64, error) `perm:"read"`
+		EthGetTransactionCount func(p0 context.Context, p1 ethtypes.EthAddress, p2 string) (ethtypes.EthUint64, error) `perm:"read"`

-		EthGetTransactionReceipt func(p0 context.Context, p1 EthHash) (*EthTxReceipt, error) `perm:"read"`
+		EthGetTransactionReceipt func(p0 context.Context, p1 ethtypes.EthHash) (*EthTxReceipt, error) `perm:"read"`

-		EthMaxPriorityFeePerGas func(p0 context.Context) (EthBigInt, error) `perm:"read"`
+		EthMaxPriorityFeePerGas func(p0 context.Context) (ethtypes.EthBigInt, error) `perm:"read"`

-		EthNewBlockFilter func(p0 context.Context) (EthFilterID, error) `perm:"write"`
+		EthNewBlockFilter func(p0 context.Context) (ethtypes.EthFilterID, error) `perm:"write"`

-		EthNewFilter func(p0 context.Context, p1 *EthFilterSpec) (EthFilterID, error) `perm:"write"`
+		EthNewFilter func(p0 context.Context, p1 *ethtypes.EthFilterSpec) (ethtypes.EthFilterID, error) `perm:"write"`

-		EthNewPendingTransactionFilter func(p0 context.Context) (EthFilterID, error) `perm:"write"`
+		EthNewPendingTransactionFilter func(p0 context.Context) (ethtypes.EthFilterID, error) `perm:"write"`

-		EthProtocolVersion func(p0 context.Context) (EthUint64, error) `perm:"read"`
+		EthProtocolVersion func(p0 context.Context) (ethtypes.EthUint64, error) `perm:"read"`

-		EthSendRawTransaction func(p0 context.Context, p1 EthBytes) (EthHash, error) `perm:"read"`
+		EthSendRawTransaction func(p0 context.Context, p1 ethtypes.EthBytes) (ethtypes.EthHash, error) `perm:"read"`

-		EthSubscribe func(p0 context.Context, p1 string, p2 *EthSubscriptionParams) (<-chan EthSubscriptionResponse, error) `perm:"write"`
+		EthSubscribe func(p0 context.Context, p1 string, p2 *ethtypes.EthSubscriptionParams) (<-chan ethtypes.EthSubscriptionResponse, error) `perm:"write"`

-		EthUninstallFilter func(p0 context.Context, p1 EthFilterID) (bool, error) `perm:"write"`
+		EthUninstallFilter func(p0 context.Context, p1 ethtypes.EthFilterID) (bool, error) `perm:"write"`

-		EthUnsubscribe func(p0 context.Context, p1 EthSubscriptionID) (bool, error) `perm:"write"`
+		EthUnsubscribe func(p0 context.Context, p1 ethtypes.EthSubscriptionID) (bool, error) `perm:"write"`

 		GasEstimateFeeCap func(p0 context.Context, p1 *types.Message, p2 int64, p3 types.TipSetKey) (types.BigInt, error) `perm:"read"`

@ -1875,344 +1875,344 @@ func (s *FullNodeStub) CreateBackup(p0 context.Context, p1 string) error {
 	return ErrNotSupported
 }

-func (s *FullNodeStruct) EthAccounts(p0 context.Context) ([]EthAddress, error) {
+func (s *FullNodeStruct) EthAccounts(p0 context.Context) ([]ethtypes.EthAddress, error) {
 	if s.Internal.EthAccounts == nil {
-		return *new([]EthAddress), ErrNotSupported
+		return *new([]ethtypes.EthAddress), ErrNotSupported
 	}
 	return s.Internal.EthAccounts(p0)
 }

-func (s *FullNodeStub) EthAccounts(p0 context.Context) ([]EthAddress, error) {
-	return *new([]EthAddress), ErrNotSupported
+func (s *FullNodeStub) EthAccounts(p0 context.Context) ([]ethtypes.EthAddress, error) {
+	return *new([]ethtypes.EthAddress), ErrNotSupported
 }

-func (s *FullNodeStruct) EthBlockNumber(p0 context.Context) (EthUint64, error) {
+func (s *FullNodeStruct) EthBlockNumber(p0 context.Context) (ethtypes.EthUint64, error) {
 	if s.Internal.EthBlockNumber == nil {
-		return *new(EthUint64), ErrNotSupported
+		return *new(ethtypes.EthUint64), ErrNotSupported
 	}
 	return s.Internal.EthBlockNumber(p0)
 }

-func (s *FullNodeStub) EthBlockNumber(p0 context.Context) (EthUint64, error) {
-	return *new(EthUint64), ErrNotSupported
+func (s *FullNodeStub) EthBlockNumber(p0 context.Context) (ethtypes.EthUint64, error) {
+	return *new(ethtypes.EthUint64), ErrNotSupported
 }

-func (s *FullNodeStruct) EthCall(p0 context.Context, p1 EthCall, p2 string) (EthBytes, error) {
+func (s *FullNodeStruct) EthCall(p0 context.Context, p1 ethtypes.EthCall, p2 string) (ethtypes.EthBytes, error) {
 	if s.Internal.EthCall == nil {
-		return *new(EthBytes), ErrNotSupported
+		return *new(ethtypes.EthBytes), ErrNotSupported
 	}
 	return s.Internal.EthCall(p0, p1, p2)
 }

-func (s *FullNodeStub) EthCall(p0 context.Context, p1 EthCall, p2 string) (EthBytes, error) {
-	return *new(EthBytes), ErrNotSupported
+func (s *FullNodeStub) EthCall(p0 context.Context, p1 ethtypes.EthCall, p2 string) (ethtypes.EthBytes, error) {
+	return *new(ethtypes.EthBytes), ErrNotSupported
 }

-func (s *FullNodeStruct) EthChainId(p0 context.Context) (EthUint64, error) {
+func (s *FullNodeStruct) EthChainId(p0 context.Context) (ethtypes.EthUint64, error) {
 	if s.Internal.EthChainId == nil {
-		return *new(EthUint64), ErrNotSupported
+		return *new(ethtypes.EthUint64), ErrNotSupported
 	}
 	return s.Internal.EthChainId(p0)
 }

-func (s *FullNodeStub) EthChainId(p0 context.Context) (EthUint64, error) {
-	return *new(EthUint64), ErrNotSupported
+func (s *FullNodeStub) EthChainId(p0 context.Context) (ethtypes.EthUint64, error) {
+	return *new(ethtypes.EthUint64), ErrNotSupported
 }

-func (s *FullNodeStruct) EthEstimateGas(p0 context.Context, p1 EthCall) (EthUint64, error) {
+func (s *FullNodeStruct) EthEstimateGas(p0 context.Context, p1 ethtypes.EthCall) (ethtypes.EthUint64, error) {
 	if s.Internal.EthEstimateGas == nil {
-		return *new(EthUint64), ErrNotSupported
+		return *new(ethtypes.EthUint64), ErrNotSupported
 	}
 	return s.Internal.EthEstimateGas(p0, p1)
 }

-func (s *FullNodeStub) EthEstimateGas(p0 context.Context, p1 EthCall) (EthUint64, error) {
-	return *new(EthUint64), ErrNotSupported
+func (s *FullNodeStub) EthEstimateGas(p0 context.Context, p1 ethtypes.EthCall) (ethtypes.EthUint64, error) {
+	return *new(ethtypes.EthUint64), ErrNotSupported
 }

-func (s *FullNodeStruct) EthFeeHistory(p0 context.Context, p1 EthUint64, p2 string, p3 []float64) (EthFeeHistory, error) {
+func (s *FullNodeStruct) EthFeeHistory(p0 context.Context, p1 ethtypes.EthUint64, p2 string, p3 []float64) (ethtypes.EthFeeHistory, error) {
 	if s.Internal.EthFeeHistory == nil {
-		return *new(EthFeeHistory), ErrNotSupported
+		return *new(ethtypes.EthFeeHistory), ErrNotSupported
 	}
 	return s.Internal.EthFeeHistory(p0, p1, p2, p3)
 }

-func (s *FullNodeStub) EthFeeHistory(p0 context.Context, p1 EthUint64, p2 string, p3 []float64) (EthFeeHistory, error) {
-	return *new(EthFeeHistory), ErrNotSupported
+func (s *FullNodeStub) EthFeeHistory(p0 context.Context, p1 ethtypes.EthUint64, p2 string, p3 []float64) (ethtypes.EthFeeHistory, error) {
+	return *new(ethtypes.EthFeeHistory), ErrNotSupported
 }

-func (s *FullNodeStruct) EthGasPrice(p0 context.Context) (EthBigInt, error) {
+func (s *FullNodeStruct) EthGasPrice(p0 context.Context) (ethtypes.EthBigInt, error) {
 	if s.Internal.EthGasPrice == nil {
-		return *new(EthBigInt), ErrNotSupported
+		return *new(ethtypes.EthBigInt), ErrNotSupported
 	}
 	return s.Internal.EthGasPrice(p0)
 }

-func (s *FullNodeStub) EthGasPrice(p0 context.Context) (EthBigInt, error) {
-	return *new(EthBigInt), ErrNotSupported
+func (s *FullNodeStub) EthGasPrice(p0 context.Context) (ethtypes.EthBigInt, error) {
+	return *new(ethtypes.EthBigInt), ErrNotSupported
 }

-func (s *FullNodeStruct) EthGetBalance(p0 context.Context, p1 EthAddress, p2 string) (EthBigInt, error) {
+func (s *FullNodeStruct) EthGetBalance(p0 context.Context, p1 ethtypes.EthAddress, p2 string) (ethtypes.EthBigInt, error) {
 	if s.Internal.EthGetBalance == nil {
-		return *new(EthBigInt), ErrNotSupported
+		return *new(ethtypes.EthBigInt), ErrNotSupported
 	}
 	return s.Internal.EthGetBalance(p0, p1, p2)
 }

-func (s *FullNodeStub) EthGetBalance(p0 context.Context, p1 EthAddress, p2 string) (EthBigInt, error) {
-	return *new(EthBigInt), ErrNotSupported
+func (s *FullNodeStub) EthGetBalance(p0 context.Context, p1 ethtypes.EthAddress, p2 string) (ethtypes.EthBigInt, error) {
+	return *new(ethtypes.EthBigInt), ErrNotSupported
 }

-func (s *FullNodeStruct) EthGetBlockByHash(p0 context.Context, p1 EthHash, p2 bool) (EthBlock, error) {
+func (s *FullNodeStruct) EthGetBlockByHash(p0 context.Context, p1 ethtypes.EthHash, p2 bool) (ethtypes.EthBlock, error) {
 	if s.Internal.EthGetBlockByHash == nil {
-		return *new(EthBlock), ErrNotSupported
+		return *new(ethtypes.EthBlock), ErrNotSupported
 	}
 	return s.Internal.EthGetBlockByHash(p0, p1, p2)
 }

-func (s *FullNodeStub) EthGetBlockByHash(p0 context.Context, p1 EthHash, p2 bool) (EthBlock, error) {
-	return *new(EthBlock), ErrNotSupported
+func (s *FullNodeStub) EthGetBlockByHash(p0 context.Context, p1 ethtypes.EthHash, p2 bool) (ethtypes.EthBlock, error) {
+	return *new(ethtypes.EthBlock), ErrNotSupported
 }

-func (s *FullNodeStruct) EthGetBlockByNumber(p0 context.Context, p1 string, p2 bool) (EthBlock, error) {
+func (s *FullNodeStruct) EthGetBlockByNumber(p0 context.Context, p1 string, p2 bool) (ethtypes.EthBlock, error) {
 	if s.Internal.EthGetBlockByNumber == nil {
-		return *new(EthBlock), ErrNotSupported
+		return *new(ethtypes.EthBlock), ErrNotSupported
 	}
 	return s.Internal.EthGetBlockByNumber(p0, p1, p2)
 }

-func (s *FullNodeStub) EthGetBlockByNumber(p0 context.Context, p1 string, p2 bool) (EthBlock, error) {
-	return *new(EthBlock), ErrNotSupported
+func (s *FullNodeStub) EthGetBlockByNumber(p0 context.Context, p1 string, p2 bool) (ethtypes.EthBlock, error) {
+	return *new(ethtypes.EthBlock), ErrNotSupported
 }

-func (s *FullNodeStruct) EthGetBlockTransactionCountByHash(p0 context.Context, p1 EthHash) (EthUint64, error) {
+func (s *FullNodeStruct) EthGetBlockTransactionCountByHash(p0 context.Context, p1 ethtypes.EthHash) (ethtypes.EthUint64, error) {
 	if s.Internal.EthGetBlockTransactionCountByHash == nil {
-		return *new(EthUint64), ErrNotSupported
+		return *new(ethtypes.EthUint64), ErrNotSupported
 	}
 	return s.Internal.EthGetBlockTransactionCountByHash(p0, p1)
 }

-func (s *FullNodeStub) EthGetBlockTransactionCountByHash(p0 context.Context, p1 EthHash) (EthUint64, error) {
-	return *new(EthUint64), ErrNotSupported
+func (s *FullNodeStub) EthGetBlockTransactionCountByHash(p0 context.Context, p1 ethtypes.EthHash) (ethtypes.EthUint64, error) {
+	return *new(ethtypes.EthUint64), ErrNotSupported
 }

-func (s *FullNodeStruct) EthGetBlockTransactionCountByNumber(p0 context.Context, p1 EthUint64) (EthUint64, error) {
+func (s *FullNodeStruct) EthGetBlockTransactionCountByNumber(p0 context.Context, p1 ethtypes.EthUint64) (ethtypes.EthUint64, error) {
 	if s.Internal.EthGetBlockTransactionCountByNumber == nil {
-		return *new(EthUint64), ErrNotSupported
+		return *new(ethtypes.EthUint64), ErrNotSupported
 	}
 	return s.Internal.EthGetBlockTransactionCountByNumber(p0, p1)
 }

-func (s *FullNodeStub) EthGetBlockTransactionCountByNumber(p0 context.Context, p1 EthUint64) (EthUint64, error) {
-	return *new(EthUint64), ErrNotSupported
+func (s *FullNodeStub) EthGetBlockTransactionCountByNumber(p0 context.Context, p1 ethtypes.EthUint64) (ethtypes.EthUint64, error) {
+	return *new(ethtypes.EthUint64), ErrNotSupported
 }

-func (s *FullNodeStruct) EthGetCode(p0 context.Context, p1 EthAddress, p2 string) (EthBytes, error) {
+func (s *FullNodeStruct) EthGetCode(p0 context.Context, p1 ethtypes.EthAddress, p2 string) (ethtypes.EthBytes, error) {
 	if s.Internal.EthGetCode == nil {
-		return *new(EthBytes), ErrNotSupported
+		return *new(ethtypes.EthBytes), ErrNotSupported
 	}
 	return s.Internal.EthGetCode(p0, p1, p2)
 }

-func (s *FullNodeStub) EthGetCode(p0 context.Context, p1 EthAddress, p2 string) (EthBytes, error) {
-	return *new(EthBytes), ErrNotSupported
+func (s *FullNodeStub) EthGetCode(p0 context.Context, p1 ethtypes.EthAddress, p2 string) (ethtypes.EthBytes, error) {
+	return *new(ethtypes.EthBytes), ErrNotSupported
 }

-func (s *FullNodeStruct) EthGetFilterChanges(p0 context.Context, p1 EthFilterID) (*EthFilterResult, error) {
+func (s *FullNodeStruct) EthGetFilterChanges(p0 context.Context, p1 ethtypes.EthFilterID) (*ethtypes.EthFilterResult, error) {
 	if s.Internal.EthGetFilterChanges == nil {
 		return nil, ErrNotSupported
 	}
 	return s.Internal.EthGetFilterChanges(p0, p1)
 }

-func (s *FullNodeStub) EthGetFilterChanges(p0 context.Context, p1 EthFilterID) (*EthFilterResult, error) {
+func (s *FullNodeStub) EthGetFilterChanges(p0 context.Context, p1 ethtypes.EthFilterID) (*ethtypes.EthFilterResult, error) {
 	return nil, ErrNotSupported
 }

-func (s *FullNodeStruct) EthGetFilterLogs(p0 context.Context, p1 EthFilterID) (*EthFilterResult, error) {
+func (s *FullNodeStruct) EthGetFilterLogs(p0 context.Context, p1 ethtypes.EthFilterID) (*ethtypes.EthFilterResult, error) {
 	if s.Internal.EthGetFilterLogs == nil {
 		return nil, ErrNotSupported
 	}
 	return s.Internal.EthGetFilterLogs(p0, p1)
 }

-func (s *FullNodeStub) EthGetFilterLogs(p0 context.Context, p1 EthFilterID) (*EthFilterResult, error) {
+func (s *FullNodeStub) EthGetFilterLogs(p0 context.Context, p1 ethtypes.EthFilterID) (*ethtypes.EthFilterResult, error) {
 	return nil, ErrNotSupported
 }

-func (s *FullNodeStruct) EthGetLogs(p0 context.Context, p1 *EthFilterSpec) (*EthFilterResult, error) {
+func (s *FullNodeStruct) EthGetLogs(p0 context.Context, p1 *ethtypes.EthFilterSpec) (*ethtypes.EthFilterResult, error) {
 	if s.Internal.EthGetLogs == nil {
 		return nil, ErrNotSupported
 	}
 	return s.Internal.EthGetLogs(p0, p1)
 }

-func (s *FullNodeStub) EthGetLogs(p0 context.Context, p1 *EthFilterSpec) (*EthFilterResult, error) {
+func (s *FullNodeStub) EthGetLogs(p0 context.Context, p1 *ethtypes.EthFilterSpec) (*ethtypes.EthFilterResult, error) {
 	return nil, ErrNotSupported
 }

-func (s *FullNodeStruct) EthGetStorageAt(p0 context.Context, p1 EthAddress, p2 EthBytes, p3 string) (EthBytes, error) {
+func (s *FullNodeStruct) EthGetStorageAt(p0 context.Context, p1 ethtypes.EthAddress, p2 ethtypes.EthBytes, p3 string) (ethtypes.EthBytes, error) {
 	if s.Internal.EthGetStorageAt == nil {
-		return *new(EthBytes), ErrNotSupported
+		return *new(ethtypes.EthBytes), ErrNotSupported
 	}
 	return s.Internal.EthGetStorageAt(p0, p1, p2, p3)
 }

-func (s *FullNodeStub) EthGetStorageAt(p0 context.Context, p1 EthAddress, p2 EthBytes, p3 string) (EthBytes, error) {
-	return *new(EthBytes), ErrNotSupported
+func (s *FullNodeStub) EthGetStorageAt(p0 context.Context, p1 ethtypes.EthAddress, p2 ethtypes.EthBytes, p3 string) (ethtypes.EthBytes, error) {
+	return *new(ethtypes.EthBytes), ErrNotSupported
 }

-func (s *FullNodeStruct) EthGetTransactionByBlockHashAndIndex(p0 context.Context, p1 EthHash, p2 EthUint64) (EthTx, error) {
+func (s *FullNodeStruct) EthGetTransactionByBlockHashAndIndex(p0 context.Context, p1 ethtypes.EthHash, p2 ethtypes.EthUint64) (ethtypes.EthTx, error) {
 	if s.Internal.EthGetTransactionByBlockHashAndIndex == nil {
-		return *new(EthTx), ErrNotSupported
+		return *new(ethtypes.EthTx), ErrNotSupported
 	}
 	return s.Internal.EthGetTransactionByBlockHashAndIndex(p0, p1, p2)
 }

-func (s *FullNodeStub) EthGetTransactionByBlockHashAndIndex(p0 context.Context, p1 EthHash, p2 EthUint64) (EthTx, error) {
-	return *new(EthTx), ErrNotSupported
+func (s *FullNodeStub) EthGetTransactionByBlockHashAndIndex(p0 context.Context, p1 ethtypes.EthHash, p2 ethtypes.EthUint64) (ethtypes.EthTx, error) {
+	return *new(ethtypes.EthTx), ErrNotSupported
 }

-func (s *FullNodeStruct) EthGetTransactionByBlockNumberAndIndex(p0 context.Context, p1 EthUint64, p2 EthUint64) (EthTx, error) {
+func (s *FullNodeStruct) EthGetTransactionByBlockNumberAndIndex(p0 context.Context, p1 ethtypes.EthUint64, p2 ethtypes.EthUint64) (ethtypes.EthTx, error) {
 	if s.Internal.EthGetTransactionByBlockNumberAndIndex == nil {
-		return *new(EthTx), ErrNotSupported
+		return *new(ethtypes.EthTx), ErrNotSupported
 	}
 	return s.Internal.EthGetTransactionByBlockNumberAndIndex(p0, p1, p2)
 }

-func (s *FullNodeStub) EthGetTransactionByBlockNumberAndIndex(p0 context.Context, p1 EthUint64, p2 EthUint64) (EthTx, error) {
-	return *new(EthTx), ErrNotSupported
+func (s *FullNodeStub) EthGetTransactionByBlockNumberAndIndex(p0 context.Context, p1 ethtypes.EthUint64, p2 ethtypes.EthUint64) (ethtypes.EthTx, error) {
+	return *new(ethtypes.EthTx), ErrNotSupported
 }

-func (s *FullNodeStruct) EthGetTransactionByHash(p0 context.Context, p1 *EthHash) (*EthTx, error) {
+func (s *FullNodeStruct) EthGetTransactionByHash(p0 context.Context, p1 *ethtypes.EthHash) (*ethtypes.EthTx, error) {
 	if s.Internal.EthGetTransactionByHash == nil {
 		return nil, ErrNotSupported
 	}
 	return s.Internal.EthGetTransactionByHash(p0, p1)
 }

-func (s *FullNodeStub) EthGetTransactionByHash(p0 context.Context, p1 *EthHash) (*EthTx, error) {
+func (s *FullNodeStub) EthGetTransactionByHash(p0 context.Context, p1 *ethtypes.EthHash) (*ethtypes.EthTx, error) {
 	return nil, ErrNotSupported
 }

-func (s *FullNodeStruct) EthGetTransactionCount(p0 context.Context, p1 EthAddress, p2 string) (EthUint64, error) {
+func (s *FullNodeStruct) EthGetTransactionCount(p0 context.Context, p1 ethtypes.EthAddress, p2 string) (ethtypes.EthUint64, error) {
 	if s.Internal.EthGetTransactionCount == nil {
-		return *new(EthUint64), ErrNotSupported
+		return *new(ethtypes.EthUint64), ErrNotSupported
 	}
 	return s.Internal.EthGetTransactionCount(p0, p1, p2)
 }

-func (s *FullNodeStub) EthGetTransactionCount(p0 context.Context, p1 EthAddress, p2 string) (EthUint64, error) {
-	return *new(EthUint64), ErrNotSupported
+func (s *FullNodeStub) EthGetTransactionCount(p0 context.Context, p1 ethtypes.EthAddress, p2 string) (ethtypes.EthUint64, error) {
+	return *new(ethtypes.EthUint64), ErrNotSupported
 }

-func (s *FullNodeStruct) EthGetTransactionReceipt(p0 context.Context, p1 EthHash) (*EthTxReceipt, error) {
+func (s *FullNodeStruct) EthGetTransactionReceipt(p0 context.Context, p1 ethtypes.EthHash) (*EthTxReceipt, error) {
 	if s.Internal.EthGetTransactionReceipt == nil {
 		return nil, ErrNotSupported
 	}
 	return s.Internal.EthGetTransactionReceipt(p0, p1)
 }

-func (s *FullNodeStub) EthGetTransactionReceipt(p0 context.Context, p1 EthHash) (*EthTxReceipt, error) {
+func (s *FullNodeStub) EthGetTransactionReceipt(p0 context.Context, p1 ethtypes.EthHash) (*EthTxReceipt, error) {
 	return nil, ErrNotSupported
 }

-func (s *FullNodeStruct) EthMaxPriorityFeePerGas(p0 context.Context) (EthBigInt, error) {
+func (s *FullNodeStruct) EthMaxPriorityFeePerGas(p0 context.Context) (ethtypes.EthBigInt, error) {
 	if s.Internal.EthMaxPriorityFeePerGas == nil {
-		return *new(EthBigInt), ErrNotSupported
+		return *new(ethtypes.EthBigInt), ErrNotSupported
 	}
 	return s.Internal.EthMaxPriorityFeePerGas(p0)
 }

-func (s *FullNodeStub) EthMaxPriorityFeePerGas(p0 context.Context) (EthBigInt, error) {
-	return *new(EthBigInt), ErrNotSupported
+func (s *FullNodeStub) EthMaxPriorityFeePerGas(p0 context.Context) (ethtypes.EthBigInt, error) {
+	return *new(ethtypes.EthBigInt), ErrNotSupported
 }

-func (s *FullNodeStruct) EthNewBlockFilter(p0 context.Context) (EthFilterID, error) {
+func (s *FullNodeStruct) EthNewBlockFilter(p0 context.Context) (ethtypes.EthFilterID, error) {
 	if s.Internal.EthNewBlockFilter == nil {
-		return *new(EthFilterID), ErrNotSupported
+		return *new(ethtypes.EthFilterID), ErrNotSupported
 	}
 	return s.Internal.EthNewBlockFilter(p0)
 }

-func (s *FullNodeStub) EthNewBlockFilter(p0 context.Context) (EthFilterID, error) {
-	return *new(EthFilterID), ErrNotSupported
+func (s *FullNodeStub) EthNewBlockFilter(p0 context.Context) (ethtypes.EthFilterID, error) {
+	return *new(ethtypes.EthFilterID), ErrNotSupported
 }

-func (s *FullNodeStruct) EthNewFilter(p0 context.Context, p1 *EthFilterSpec) (EthFilterID, error) {
+func (s *FullNodeStruct) EthNewFilter(p0 context.Context, p1 *ethtypes.EthFilterSpec) (ethtypes.EthFilterID, error) {
 	if s.Internal.EthNewFilter == nil {
-		return *new(EthFilterID), ErrNotSupported
+		return *new(ethtypes.EthFilterID), ErrNotSupported
 	}
 	return s.Internal.EthNewFilter(p0, p1)
 }

-func (s *FullNodeStub) EthNewFilter(p0 context.Context, p1 *EthFilterSpec) (EthFilterID, error) {
-	return *new(EthFilterID), ErrNotSupported
+func (s *FullNodeStub) EthNewFilter(p0 context.Context, p1 *ethtypes.EthFilterSpec) (ethtypes.EthFilterID, error) {
+	return *new(ethtypes.EthFilterID), ErrNotSupported
 }

-func (s *FullNodeStruct) EthNewPendingTransactionFilter(p0 context.Context) (EthFilterID, error) {
+func (s *FullNodeStruct) EthNewPendingTransactionFilter(p0 context.Context) (ethtypes.EthFilterID, error) {
 	if s.Internal.EthNewPendingTransactionFilter == nil {
-		return *new(EthFilterID), ErrNotSupported
+		return *new(ethtypes.EthFilterID), ErrNotSupported
 	}
 	return s.Internal.EthNewPendingTransactionFilter(p0)
 }

-func (s *FullNodeStub) EthNewPendingTransactionFilter(p0 context.Context) (EthFilterID, error) {
-	return *new(EthFilterID), ErrNotSupported
+func (s *FullNodeStub) EthNewPendingTransactionFilter(p0 context.Context) (ethtypes.EthFilterID, error) {
+	return *new(ethtypes.EthFilterID), ErrNotSupported
 }

-func (s *FullNodeStruct) EthProtocolVersion(p0 context.Context) (EthUint64, error) {
+func (s *FullNodeStruct) EthProtocolVersion(p0 context.Context) (ethtypes.EthUint64, error) {
 	if s.Internal.EthProtocolVersion == nil {
-		return *new(EthUint64), ErrNotSupported
+		return *new(ethtypes.EthUint64), ErrNotSupported
 	}
 	return s.Internal.EthProtocolVersion(p0)
 }

-func (s *FullNodeStub) EthProtocolVersion(p0 context.Context) (EthUint64, error) {
-	return *new(EthUint64), ErrNotSupported
+func (s *FullNodeStub) EthProtocolVersion(p0 context.Context) (ethtypes.EthUint64, error) {
+	return *new(ethtypes.EthUint64), ErrNotSupported
 }

-func (s *FullNodeStruct) EthSendRawTransaction(p0 context.Context, p1 EthBytes) (EthHash, error) {
+func (s *FullNodeStruct) EthSendRawTransaction(p0 context.Context, p1 ethtypes.EthBytes) (ethtypes.EthHash, error) {
 	if s.Internal.EthSendRawTransaction == nil {
-		return *new(EthHash), ErrNotSupported
+		return *new(ethtypes.EthHash), ErrNotSupported
 	}
 	return s.Internal.EthSendRawTransaction(p0, p1)
 }

-func (s *FullNodeStub) EthSendRawTransaction(p0 context.Context, p1 EthBytes) (EthHash, error) {
-	return *new(EthHash), ErrNotSupported
+func (s *FullNodeStub) EthSendRawTransaction(p0 context.Context, p1 ethtypes.EthBytes) (ethtypes.EthHash, error) {
+	return *new(ethtypes.EthHash), ErrNotSupported
 }

-func (s *FullNodeStruct) EthSubscribe(p0 context.Context, p1 string, p2 *EthSubscriptionParams) (<-chan EthSubscriptionResponse, error) {
+func (s *FullNodeStruct) EthSubscribe(p0 context.Context, p1 string, p2 *ethtypes.EthSubscriptionParams) (<-chan ethtypes.EthSubscriptionResponse, error) {
 	if s.Internal.EthSubscribe == nil {
 		return nil, ErrNotSupported
 	}
 	return s.Internal.EthSubscribe(p0, p1, p2)
 }

-func (s *FullNodeStub) EthSubscribe(p0 context.Context, p1 string, p2 *EthSubscriptionParams) (<-chan EthSubscriptionResponse, error) {
+func (s *FullNodeStub) EthSubscribe(p0 context.Context, p1 string, p2 *ethtypes.EthSubscriptionParams) (<-chan ethtypes.EthSubscriptionResponse, error) {
 	return nil, ErrNotSupported
 }

-func (s *FullNodeStruct) EthUninstallFilter(p0 context.Context, p1 EthFilterID) (bool, error) {
+func (s *FullNodeStruct) EthUninstallFilter(p0 context.Context, p1 ethtypes.EthFilterID) (bool, error) {
 	if s.Internal.EthUninstallFilter == nil {
 		return false, ErrNotSupported
 	}
 	return s.Internal.EthUninstallFilter(p0, p1)
 }

-func (s *FullNodeStub) EthUninstallFilter(p0 context.Context, p1 EthFilterID) (bool, error) {
+func (s *FullNodeStub) EthUninstallFilter(p0 context.Context, p1 ethtypes.EthFilterID) (bool, error) {
 	return false, ErrNotSupported
 }

-func (s *FullNodeStruct) EthUnsubscribe(p0 context.Context, p1 EthSubscriptionID) (bool, error) {
+func (s *FullNodeStruct) EthUnsubscribe(p0 context.Context, p1 ethtypes.EthSubscriptionID) (bool, error) {
 	if s.Internal.EthUnsubscribe == nil {
 		return false, ErrNotSupported
 	}
 	return s.Internal.EthUnsubscribe(p0, p1)
 }

-func (s *FullNodeStub) EthUnsubscribe(p0 context.Context, p1 EthSubscriptionID) (bool, error) {
+func (s *FullNodeStub) EthUnsubscribe(p0 context.Context, p1 ethtypes.EthSubscriptionID) (bool, error) {
 	return false, ErrNotSupported
 }

--- a/build/actors/v10.tar.zst
+++ b/build/actors/v10.tar.zst
--- a/build/builtin_actors_gen.go
+++ b/build/builtin_actors_gen.go
@ -44,23 +44,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 }, {
 	Network:     "butterflynet",
 	Version:     10,
-	ManifestCid: MustParseCid("bafy2bzaceciz4ytt5gnn6gc4epez7v6xeg6efkgbvwfxkoa34o2gj3hp5f7zc"),
+	ManifestCid: MustParseCid("bafy2bzacea6kki7qtpkuxhskje3p7tuwmsdb2lequi3fjo7q2g4egedgmcaos"),
 	Actors: map[string]cid.Cid{
-		"account":          MustParseCid("bafk2bzacedavorwsriewoddjlaganjpsk3o7zfts2wyid3clv5xnctacg37j2"),
-		"cron":             MustParseCid("bafk2bzacebtauucwaewxuzgxfpjtmn6xt3kya4om4ugyprlkhhkde76h7fkqg"),
-		"datacap":          MustParseCid("bafk2bzacebzdjapqwasq6woxkgq2nm2nre3v7cl2754xwiuo2cfhvsceq4cba"),
-		"eam":              MustParseCid("bafk2bzacecmr4zdbpfnemvgo446qby7x4y4v5cbfespt3f6ousv2hxnflyrlk"),
-		"embryo":           MustParseCid("bafk2bzacebj2mj5zlcs3yjlgpbznzistfjkdlwaoncjziliqrxqavvz4dcvnk"),
-		"evm":              MustParseCid("bafk2bzacebuewexvig54cuvsvwn4k4zr36tm2q5fel4ezq4v7363n2lmn362k"),
-		"init":             MustParseCid("bafk2bzacebww5gsctsk5hack2alkt4kh55bmpb4ywzbyyhoaskryymjj3snj6"),
-		"multisig":         MustParseCid("bafk2bzacec5k4wxvou34pyjd5kcsrbsfnlk4k753kkscg3ron2r7tsxollfsq"),
-		"paymentchannel":   MustParseCid("bafk2bzacebzdeaxglaqpmegalakmxr6secjd24mu5llo4ctoy7pvom5upyuvs"),
-		"reward":           MustParseCid("bafk2bzaceb4hyabxnyrrsno5erqqwk5ynnjibblzfcaq3aotlz3ek4uu6dyla"),
-		"storagemarket":    MustParseCid("bafk2bzacedpocbf2lg2x2jg6arw2argnwmvo2hyjqvpkrgfu4khz5mtlzxz2o"),
-		"storageminer":     MustParseCid("bafk2bzaceacrumah7jdfc62bmvemob4lsh5yiohwodest2cgxakgnn24cenlk"),
-		"storagepower":     MustParseCid("bafk2bzaceaxz6n5nywermfptnz6dc53vqsa42lic4rf66l4irm3mqfj4ak5ps"),
-		"system":           MustParseCid("bafk2bzaceb4w5bblgyu25ylytpmfrixjsk2ra6emd44j4mv42xfxbwnqloyzi"),
-		"verifiedregistry": MustParseCid("bafk2bzacedbz2koeb6teewobcjdpgfv7qdae7utgoka6wzlkf6gronnis2nn2"),
+		"account":          MustParseCid("bafk2bzacebvgiflqavofskiq56aj4ktkzediyeo7j4cqqdkbmu6f3pib4sbb2"),
+		"cron":             MustParseCid("bafk2bzaceb4mn2ehsyjueq4ja3zmvmgstx2sdvzvf52xzs7pzlumxr7acr5sk"),
+		"datacap":          MustParseCid("bafk2bzacecetu7dadc2dznwhutwl43lislb22qqdkdmpwgmonspiiysud63rg"),
+		"eam":              MustParseCid("bafk2bzacebuexqxddkgyptjn5cmldjkbmxgmkq5i4pbvtdwcdcfdt63fpwrwe"),
+		"embryo":           MustParseCid("bafk2bzaceax2tehd7m42kxf3z56hjj67buzucn5cj2456daz5yj4ai5txs2r4"),
+		"ethaccount":       MustParseCid("bafk2bzacebeqqs3ov6olevtpnra4txkfumnx5yqi2hrn47nphyzz3wjb5s3xa"),
+		"evm":              MustParseCid("bafk2bzacedgfppymynx6gf5t5abs25fhpjljwp3pzyg2rh777iq4qkoxv6r2m"),
+		"init":             MustParseCid("bafk2bzacedezxmexxjrxda3aqyghk6v53to4dxtpcvk3oyp5hrpxsmhokjtzk"),
+		"multisig":         MustParseCid("bafk2bzaceady5ddezunmb77i2yod727jx5tegdxdhxric4hv5tdgoyj2yzs76"),
+		"paymentchannel":   MustParseCid("bafk2bzacedljjqkbtn33jlx5iic6rxz6g7l5j55xut5kvxkp3n53lfguhh3tk"),
+		"reward":           MustParseCid("bafk2bzacecpaajt7l47j2oh4k5xm2lkpfxssy2s3ruethh3nrjqa5vzk636ee"),
+		"storagemarket":    MustParseCid("bafk2bzacedyg67aeetx7yc5nhkv24dyy5qgsb4miktqtbllhb25qxhezxkeua"),
+		"storageminer":     MustParseCid("bafk2bzacecmrhmmowsetorpgl5ljbfzowe7p5jhsg6qrpqffcxiobj6viouts"),
+		"storagepower":     MustParseCid("bafk2bzacedygmbf2reecyktif77fhgik6r2hrt5lpxwcrcsvgrb6fzuz64r5e"),
+		"system":           MustParseCid("bafk2bzacedobj3mr33345jy236wzbs46luvqxllczmmv2leqkonezskibehxa"),
+		"verifiedregistry": MustParseCid("bafk2bzacecaud67cooasim3xmykvla7sprxds5vjpyjugwaubapmglxwrcd5m"),
 	},
 }, {
 	Network:     "calibrationnet",
@ -100,23 +101,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 }, {
 	Network:     "calibrationnet",
 	Version:     10,
-	ManifestCid: MustParseCid("bafy2bzaced7wbd43lvgc55xb37mkoo4ppev6ig4jj4j7dtswtjfjq4u5qmpck"),
+	ManifestCid: MustParseCid("bafy2bzaceavw3rjjahsviowz6nprq6ame33tel5tqzsmpfh7uw4tov24gkcww"),
 	Actors: map[string]cid.Cid{
-		"account":          MustParseCid("bafk2bzacecq4owv5begvryvpsy4atfb2jnf7g7o4hxovtdb5a4jfkzacownli"),
-		"cron":             MustParseCid("bafk2bzaced4uz5w5h5wksx4end27lphd4qc4kh7q336uyt46lba5ddynwftya"),
-		"datacap":          MustParseCid("bafk2bzacedoc7y4s5n3p2zo4bcmafcrellkakn2e3uyf5wb3mtbuqhvwqn2l4"),
-		"eam":              MustParseCid("bafk2bzacealpqjgz5qmucm3v6z6hn36igx7zijixhqrxwoj3g4bdgvyml3adi"),
-		"embryo":           MustParseCid("bafk2bzacebj2mj5zlcs3yjlgpbznzistfjkdlwaoncjziliqrxqavvz4dcvnk"),
-		"evm":              MustParseCid("bafk2bzacedmlmyy2efbt4qk5ighawiychklhzc6pzyiwvpijwvxoq3xyxlgxw"),
-		"init":             MustParseCid("bafk2bzaceaqcfmfylwdemq5bdcelydpf6iqfct4p7b2zwtmqyhuxn522yvic2"),
-		"multisig":         MustParseCid("bafk2bzacebuh55hkbkobmmoaoduruss5nsh6e2gtqtdbqsmw6e7k5vg6heyrm"),
-		"paymentchannel":   MustParseCid("bafk2bzacedcpzw7prdoxnaclcvmtwr6yf54zi4bzzwe5w3xknh72ji6p3qfc6"),
-		"reward":           MustParseCid("bafk2bzaced74ym6j424zzbr6millasfcyl3r4zm5fnauasrwn3ti6fdarbkym"),
-		"storagemarket":    MustParseCid("bafk2bzacec7delr2q42yj4wu3daa5xjz4zezeivphtx3xwyvpgwpdnfoevhh2"),
-		"storageminer":     MustParseCid("bafk2bzaced7isnew5lhu237pdtwaqmbv65qqvfmmnve2c5yfobtfqw2fptuvc"),
-		"storagepower":     MustParseCid("bafk2bzacebe5frk6gcgzcvzkxavhhbs3id3iyacybn7y7gxwzgl5t6zawzswg"),
-		"system":           MustParseCid("bafk2bzacectivaezqijucle5s2f7xeui5uxig7bnk7fe4vsvz3xu7agjtb2ge"),
-		"verifiedregistry": MustParseCid("bafk2bzaceczgwckte4exultjxyzgzoo6m6r5coyphnlappi4clethhhybslxc"),
+		"account":          MustParseCid("bafk2bzacedifn4xp6aike3xdgntk355pgb3ky6bme454t6dpol5235w2vibwi"),
+		"cron":             MustParseCid("bafk2bzacecwcvtgwto3s5o6v5jzx2rvbzv6uaixws7i4epdcsxgg52hwtw2tm"),
+		"datacap":          MustParseCid("bafk2bzaceczuhzrowju6c6jk2agkrqahjnkm3abu3dvjve5g6z3xng2m7hxwq"),
+		"eam":              MustParseCid("bafk2bzacecpf4u5zr2ilft5rt3i3s4alldjxqekhdruwrfqts57fwwoagjjws"),
+		"embryo":           MustParseCid("bafk2bzaceax2tehd7m42kxf3z56hjj67buzucn5cj2456daz5yj4ai5txs2r4"),
+		"ethaccount":       MustParseCid("bafk2bzacec5kyeyy32zmucx3vbiw22j4znmmdvzkdoqu2e5e5gk33bhbfkseq"),
+		"evm":              MustParseCid("bafk2bzacec72jwgdndy2gnbvzapknihdlp27f3qvj3ykmj6paq7o6tdgbykvq"),
+		"init":             MustParseCid("bafk2bzacea6mrjm65wr436mlgv6eaceghfvpchcueqf3qsdon5e2paxnoqgtm"),
+		"multisig":         MustParseCid("bafk2bzaceaeuzxfixer56laljcn34tygi2kvngstqmhwz7ushjx4qwx4n5mi2"),
+		"paymentchannel":   MustParseCid("bafk2bzacecm6k45iz277jypjd6sfyjodgbiwymblsch6wnkz4q2uzzmy4gsuw"),
+		"reward":           MustParseCid("bafk2bzacebr7gdppcalate32rukzbbezbyk6sounbdigb2asyeodcjdedzpm2"),
+		"storagemarket":    MustParseCid("bafk2bzacea6kvoeb2v4mmvhf4vzmxim3objnsasjfg33jabqianczt7i3zyfi"),
+		"storageminer":     MustParseCid("bafk2bzacecrmibyb4oyd53ik3zva5debmyzha72l65oom3ulwftfiv6jo5va2"),
+		"storagepower":     MustParseCid("bafk2bzaceajch5ed7s2ennbnfny6r4l2kpidnxbsclqedvufi2b5635vsgabe"),
+		"system":           MustParseCid("bafk2bzacea6dferxxxiimkdl43y7yqh6rywtbrprrg76pn2xfkyixwgd6j2jw"),
+		"verifiedregistry": MustParseCid("bafk2bzaceckaisg3sv4j6d3bsu5rqpvtw4vvzsosb5e2brxcllvjymgj6uvaa"),
 	},
 }, {
 	Network:     "caterpillarnet",
@ -156,23 +158,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 }, {
 	Network:     "caterpillarnet",
 	Version:     10,
-	ManifestCid: MustParseCid("bafy2bzacea5csj2os7h76a6yvf6shgpwkysawijxemk5uvvzejxrwjo6ir4yg"),
+	ManifestCid: MustParseCid("bafy2bzacedkotw6g6uork3rjwqtoixta4ajphfqrjjqef6p3grqd5bwu7o6t6"),
 	Actors: map[string]cid.Cid{
-		"account":          MustParseCid("bafk2bzacea7tpruyxdgyz4xa7curiphwdw4abmspft3ee24puruazdcl3tq5c"),
-		"cron":             MustParseCid("bafk2bzacebc6kkj7kzsicm5baszjgd37b4b3kijsffqmmkhhjlyd7zhkwfcqm"),
-		"datacap":          MustParseCid("bafk2bzaceddcmwl6po2jd3tfkkgv4zvub7i47gsx33pkqdspqhgvhe4npc4as"),
-		"eam":              MustParseCid("bafk2bzaceccsvcww2rmqnh4plkq6oapqaeqbhydrtup54z4dwunolz5tpgtb4"),
-		"embryo":           MustParseCid("bafk2bzacebj2mj5zlcs3yjlgpbznzistfjkdlwaoncjziliqrxqavvz4dcvnk"),
-		"evm":              MustParseCid("bafk2bzacea5sig3zpxfkqppoj3t344cvuhzvkx6ge2isgdzc34rfpng2ogdje"),
-		"init":             MustParseCid("bafk2bzacedtby353aho7itoyoj7w6moydmigjm3sgy6djgnfxqehlpae4vcc2"),
-		"multisig":         MustParseCid("bafk2bzacedyguvwz5zfveqoqicn3j6lkdzipf247nhvdi6dvmahulr7nzgox6"),
-		"paymentchannel":   MustParseCid("bafk2bzaceavaatmmnsz3v3ksopcbu6jx4iq7u7nnmqbclsiabsfkfu3zfpmka"),
-		"reward":           MustParseCid("bafk2bzacecrphs4avteik4yejsqwkpy5bcqramdhnzykbfq3uu2qalj2p26ti"),
-		"storagemarket":    MustParseCid("bafk2bzaceajby2jb5m3fenzarum374zxdzuyrpkspfljwovu7c3hvyceqd5sa"),
-		"storageminer":     MustParseCid("bafk2bzacebqtn7jdvk756ighri5ajro6gjepnef3c6rxupbbgkth62zytiy5s"),
-		"storagepower":     MustParseCid("bafk2bzacedwlo32brlalpovfkkk7qwo3ou2kpgv2bf7fioy5srn7uejmn7n46"),
-		"system":           MustParseCid("bafk2bzacebbt63h26x5vw5fdo2pmdb4q65u3t6lilkugvmjar6zfsc7ethxsi"),
-		"verifiedregistry": MustParseCid("bafk2bzacecr5kbyypdxnxlepzk5sji2k72t454vto5ok4owfcuwfpeyivjtu4"),
+		"account":          MustParseCid("bafk2bzaceckyjekq4bk5cdi2jxwm7frt4zi3fgx6jtxxwasjyf7novw6wjygy"),
+		"cron":             MustParseCid("bafk2bzacedgrej6vnsjiagnt32uwmaaj7elar7qbqepmd7tbqgi4kvnut77fs"),
+		"datacap":          MustParseCid("bafk2bzaceaty2is6zk4riuovw3sljonxwy6z4kor6iqn7qhpvisqwaytunhfi"),
+		"eam":              MustParseCid("bafk2bzacebdnuqjgeeulpkre7pi7dhsyy2ylbhc2kaz2q3x774zcykwsnbh4y"),
+		"embryo":           MustParseCid("bafk2bzaceax2tehd7m42kxf3z56hjj67buzucn5cj2456daz5yj4ai5txs2r4"),
+		"ethaccount":       MustParseCid("bafk2bzaceayfch6isxpeocfq2gxdmzbk7cnj34qpuieb5mckutstjmffntrm2"),
+		"evm":              MustParseCid("bafk2bzaceb7cxusflapxwubzwcievqtobkk2jhyek2wrgv2ym5io2s4xfy3aw"),
+		"init":             MustParseCid("bafk2bzacebkwjggvge2budrgnhuclmyzivqvw2qt33odgxbycvr2dhdk6ipvq"),
+		"multisig":         MustParseCid("bafk2bzacebyzyofjm636trmq5uriaccfbvnkjfxmjayfo3autndtuxpbz52co"),
+		"paymentchannel":   MustParseCid("bafk2bzacea4m4bhoilmjzrrl7og2oudyj6juy3adod2duy6gkl3pzkunefpls"),
+		"reward":           MustParseCid("bafk2bzaceavtfypwa6qpeo3j7bc2ty3zkphefy4hep43hhx4kssfmdr3utsga"),
+		"storagemarket":    MustParseCid("bafk2bzacecoudxpin4hwajlzp7wufntfijus4nlnacfbqv4n3zfd4cstezmg6"),
+		"storageminer":     MustParseCid("bafk2bzacebflyrvdlc2iu7aehjtaue5nsu45oelpzwrt7wslyngeyzyjderom"),
+		"storagepower":     MustParseCid("bafk2bzacedem5mvgirhfloykv5owwafcleaaeog3x27datnnmfs2tp7yqwilg"),
+		"system":           MustParseCid("bafk2bzacedtfjxsiimp2cfwpx2ocy6vvtj3xs57spddrywmodpzqhpov7az74"),
+		"verifiedregistry": MustParseCid("bafk2bzacec7slmn6lrpooarehctxdtmjdbizoxsj345im53x5u3mbphnp7764"),
 	},
 }, {
 	Network:     "devnet",
@ -212,23 +215,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 }, {
 	Network:     "devnet",
 	Version:     10,
-	ManifestCid: MustParseCid("bafy2bzacea73thrlpfejrswlcu5uhe7rcgdewvmrcwoef6jzngsba3i4v5ibi"),
+	ManifestCid: MustParseCid("bafy2bzaced4j4o6aujjdnrcedyzqmdmy335mamepf5wxjxtrrrcbmjqjkwmai"),
 	Actors: map[string]cid.Cid{
-		"account":          MustParseCid("bafk2bzaceau2o55aripm7kqrbzzog72zcduv5psnxzpohx5rdkykepc4z7aag"),
-		"cron":             MustParseCid("bafk2bzacec5qc5xluwikf4lolfa4oe356iwep25tiezbxfdyg5jib54rhlh6q"),
-		"datacap":          MustParseCid("bafk2bzacebo47u6q3xou5exsecjpa4rpfqjfm7vyhz4qlr3nk7p46trsk4occ"),
-		"eam":              MustParseCid("bafk2bzacea6yeptevserd7ayf4ahokor4sdpizpxpbqwkuvvhzdkon672shsm"),
-		"embryo":           MustParseCid("bafk2bzacebj2mj5zlcs3yjlgpbznzistfjkdlwaoncjziliqrxqavvz4dcvnk"),
-		"evm":              MustParseCid("bafk2bzacebi46zgjili4luu3nqy6mno5k4skvo4cvs7genhkdfaukhtw7xirw"),
-		"init":             MustParseCid("bafk2bzacedvf2bij6jovem2dfzkz347yvmydxj7vlgaiagosz5t3c5jyy43zu"),
-		"multisig":         MustParseCid("bafk2bzacecukolwx6y5pcajnxg2aawiubgxo5zyj24a23zg5t4qu3k4qbofh4"),
-		"paymentchannel":   MustParseCid("bafk2bzacecwyih7nodrwsw5vyl5zk7fapklje76jpowqjr6x6br2bm55smqqy"),
-		"reward":           MustParseCid("bafk2bzacea6vfrcprxg2i4l5qnigf4c6pyvnjxpzfqr4pmph3elif7sfidrei"),
-		"storagemarket":    MustParseCid("bafk2bzaceahradb3od4ahs46x6yriwvm36iabgtohhoiolubsumto5eravzbu"),
-		"storageminer":     MustParseCid("bafk2bzacedekivqgvqapbepvzn6jte3xyymyg5yjuwy42xvboa6rcqnzgo74u"),
-		"storagepower":     MustParseCid("bafk2bzacedkmiosllqqqarmr53twspyswdvsm7givwczgo3qqsxzpad4hzjma"),
-		"system":           MustParseCid("bafk2bzaceagdymtxb4lxqqjgmnphbgdtdgveuuqaouswpzagj4bpbon3ptop4"),
-		"verifiedregistry": MustParseCid("bafk2bzacec556wsqldm22k2abshvvnsrawlm3bbqkwzht6ubcj76m2jsy3azi"),
+		"account":          MustParseCid("bafk2bzacechueo4lu2celcpv54wfcg24fmrzhxflqqzo2wlisbmfnau5admrk"),
+		"cron":             MustParseCid("bafk2bzacecwazk6vmemzhpqbziuc4h4ldmomvxbb64dpxdoupnbe22rq3ay7o"),
+		"datacap":          MustParseCid("bafk2bzaceaq7ghb7j7tzjm3moeqnpzwwm22jmmxrtid7wb7bgudw5zuhbu6kk"),
+		"eam":              MustParseCid("bafk2bzaceb7r6vktesqypltzqmdwev7izvljce3zbtgvrzz56zfoutvcmbmac"),
+		"embryo":           MustParseCid("bafk2bzaceax2tehd7m42kxf3z56hjj67buzucn5cj2456daz5yj4ai5txs2r4"),
+		"ethaccount":       MustParseCid("bafk2bzacedtdrfesgj6w6e4txltpwyhvu655dl6y3z3h3yszfcrfl2thcmvg2"),
+		"evm":              MustParseCid("bafk2bzacebefcg7i6qa6b6hnnbdaobxe5knusmfxszydw5fcpradcdgnfxevu"),
+		"init":             MustParseCid("bafk2bzacedgihzwljh7ss3i77fvfrmiei6rg2u3fxrlhxasnexmdsqt2wok32"),
+		"multisig":         MustParseCid("bafk2bzacea6ecjhk64kh3mzcfd4elk5fj7c5dodey2jzpfd75h73mhpv5q5pg"),
+		"paymentchannel":   MustParseCid("bafk2bzaceduj4lck7aywx2byp4xadkao6iapaze76b3gs46ueo4hwjwptuq56"),
+		"reward":           MustParseCid("bafk2bzacednnsuol6pxcqduhwyi4jpn2ci6llw6e5jsps2t4zvqwhrizqk3jq"),
+		"storagemarket":    MustParseCid("bafk2bzacecmoed6ip7omv4qm55klsa73zh6qb2pxapavvnw5d3uxymowdcbg2"),
+		"storageminer":     MustParseCid("bafk2bzaceaeuxvmxuwkezbigjfnieirqkljl4evyjsfu2hklun2legmp6emos"),
+		"storagepower":     MustParseCid("bafk2bzacec447h7soxygu37fph3f5qgua6t4e5h53p4cfk56zhxhw4xhavjt6"),
+		"system":           MustParseCid("bafk2bzacec742xs2egn2xyfbspjkszsinpgamtdm4cj45k55mmw2gwbp7le7c"),
+		"verifiedregistry": MustParseCid("bafk2bzacedw6yaadhwqeifx2tr66zz2l4q5x37sb6udbbrwpopcwavlmyf65g"),
 	},
 }, {
 	Network:     "mainnet",
@ -268,23 +272,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 }, {
 	Network:     "mainnet",
 	Version:     10,
-	ManifestCid: MustParseCid("bafy2bzaceduyggnyqhlr346hfw32tbobzrvhzhill33zhe7jw64pmwjci2xoc"),
+	ManifestCid: MustParseCid("bafy2bzaceb2pad2sm5pp73mplrgn43zgcruhnog3rtovxdstc33j6tqw2txeu"),
 	Actors: map[string]cid.Cid{
-		"account":          MustParseCid("bafk2bzacedmr3wxl7qmhquageorrt3aavbzqfpm7eymxidakwuhaobu7dseqs"),
-		"cron":             MustParseCid("bafk2bzaceblekxapm5nnqnxmw3mk27236iyutvbhhpsc3fyde7zi7guccn7cc"),
-		"datacap":          MustParseCid("bafk2bzacedu4jevyvqsilq7bq4uhegbkm75muwebc5ifqpfaojwhexf2j4i6a"),
-		"eam":              MustParseCid("bafk2bzacedc7224twbolvdq6iwc7ybdpah2ywe3ueo33jv67ecimndinle374"),
-		"embryo":           MustParseCid("bafk2bzacebj2mj5zlcs3yjlgpbznzistfjkdlwaoncjziliqrxqavvz4dcvnk"),
-		"evm":              MustParseCid("bafk2bzaceaggldo6wmkvp5innv4pnjv4xnpedspzofvma3dhu7vk45hh5djoq"),
-		"init":             MustParseCid("bafk2bzacedutlaebaczkdi4vqvt3xim24u3whleqk2r4lufjd5jnmxcosea6q"),
-		"multisig":         MustParseCid("bafk2bzaceatiqxjwtugpzus3s52zoggnrftxqn7kiw3obvjgkjvtd6zr3636q"),
-		"paymentchannel":   MustParseCid("bafk2bzacebyviac6i43gtsvmjfg6mzcp6rwgz44axidc7m432btbmvt7i2m2g"),
-		"reward":           MustParseCid("bafk2bzacecbcnlvk2izojpfoaksitqenhzaofn6ynxx5pegl4y45wjlouexdi"),
-		"storagemarket":    MustParseCid("bafk2bzacebobteeoz2jycplgtydfyltzughegz2sopn6pzy2udjfvuo77joyk"),
-		"storageminer":     MustParseCid("bafk2bzacecwcypas3y6u4rya7qolfwmou437xgrjxh7mnnim7bo3nhk4dscxw"),
-		"storagepower":     MustParseCid("bafk2bzacec62kids6rcrdmdeqhwiz3s5rs35s5gn25ilwemgmm6jqnr2rnaaq"),
-		"system":           MustParseCid("bafk2bzacecj3c4bjbs2xfttn7zqle7yocqh47u2s7hwuxrsn7fi5h74tcyxoc"),
-		"verifiedregistry": MustParseCid("bafk2bzacedgf7zbnlste5ukzueduemkimiit64scz7lvebztufx5jxtx6gkz2"),
+		"account":          MustParseCid("bafk2bzaced52tigw7332nbwmntkhc3cbnhfwofxjgmgbb4a4zrz32ssoryoa2"),
+		"cron":             MustParseCid("bafk2bzacecvbqhnxwrbdcmkby6gbancdegzpd5deur2gwz7m4jofqqvuwzjlq"),
+		"datacap":          MustParseCid("bafk2bzacebsbpmcmu6iulwsyqfvvlmb3gb7wkikomxelic7q4edwm2se3mmkw"),
+		"eam":              MustParseCid("bafk2bzacedlitpm3xq6ccwvagen74j33g4b5modvhmdyfdp3zgugdzi5i7zca"),
+		"embryo":           MustParseCid("bafk2bzaceax2tehd7m42kxf3z56hjj67buzucn5cj2456daz5yj4ai5txs2r4"),
+		"ethaccount":       MustParseCid("bafk2bzaceb3lxonodwk37f2oir6bniided2igfmzyguahvbr2jboqxtw36msg"),
+		"evm":              MustParseCid("bafk2bzacedcd6nssqvrkhj5poggswcsx6nwhp6c35r7qdcuhpr3n3n7hvt4io"),
+		"init":             MustParseCid("bafk2bzacebpxqu3snf35csvq3xhammyksous2vq3b5vo4j4wcmisfefc2g3im"),
+		"multisig":         MustParseCid("bafk2bzaceayuaank6skp6vjemcpkkrq3j27aqdj7dxbz4zsrg4jrlgdqv4lki"),
+		"paymentchannel":   MustParseCid("bafk2bzacebq4cq3bwtcwkqlogeeb2kd2wszi574qpeerlnyu6ue7uaa5yhrs6"),
+		"reward":           MustParseCid("bafk2bzacebyps7ufqmyoleu2l6khm2f5lm4f7fdetsel2dkhob6ap3mncz3f4"),
+		"storagemarket":    MustParseCid("bafk2bzacearla63zfijzysmg7bq53px5meslo6bs57wc22unepsb5vq2kmbxa"),
+		"storageminer":     MustParseCid("bafk2bzacedwn3amkxwp5gfn3padbtstzukoxdny4zb3i72vtfyecf5qqfmx6c"),
+		"storagepower":     MustParseCid("bafk2bzaceaqj4nwaekiczhqa5c3ijoj2qdtf6zyny573ybh5agk2wyfn5hrwa"),
+		"system":           MustParseCid("bafk2bzacecnu27jhvsccspft5nlnava5ymj53qid2tvtoa5gq3whixejuqzc2"),
+		"verifiedregistry": MustParseCid("bafk2bzaceb5a3hot67g62augmuxmeu7nzwy4eputtdd5w6ncuhheycjzwbucu"),
 	},
 }, {
 	Network:     "testing",
@ -324,23 +329,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 }, {
 	Network:     "testing",
 	Version:     10,
-	ManifestCid: MustParseCid("bafy2bzacearlgbespxi2zdrybtp2rrbwscmtbyou5qa2egbdvcz6v2yjjqvjo"),
+	ManifestCid: MustParseCid("bafy2bzaceav62uv5asafn2z5ycqtgfbiziym7lkfgdfoauxkjg23qj6lwgo2q"),
 	Actors: map[string]cid.Cid{
-		"account":          MustParseCid("bafk2bzaceba6me5ipkcijuhyypnzjydhv3ebi2ctailar7mtzlk4vk3rbxfee"),
-		"cron":             MustParseCid("bafk2bzacea6k2mai2xnakygqvbigivfrvv5q7d34qrzjv2crkqtwbjxnxmkbe"),
-		"datacap":          MustParseCid("bafk2bzaceah4oxcgck6bcfkzctm2klpvmltyidq7uxnlkcap6ypi3lnkcvrqk"),
-		"eam":              MustParseCid("bafk2bzacedjtkvocrnkrot2oztsfrxtpwl32wwbmbkrjfbbm4xipwzrhhxn5c"),
-		"embryo":           MustParseCid("bafk2bzacebj2mj5zlcs3yjlgpbznzistfjkdlwaoncjziliqrxqavvz4dcvnk"),
-		"evm":              MustParseCid("bafk2bzaced6vhabkr2ojpjzsybrq5yvksjzpjk6yei6fwobkwwydlj5f473pw"),
-		"init":             MustParseCid("bafk2bzaceaib3o5e7wop7kwjirgpferqarmngrgjkur2yhdnwplctidpxsgme"),
-		"multisig":         MustParseCid("bafk2bzaced4z3awacxumq6yr33a3adu2legb7colahgvqpmigs3fvvjxs3byc"),
-		"paymentchannel":   MustParseCid("bafk2bzaceb6mfi24mpzt7qlkratj2tdtqo7aia67zcztuslrxcjaycz6fnai6"),
-		"reward":           MustParseCid("bafk2bzacebngh5kwtem4ncarpjtxhs4rwyoficttkgxlsjtiz5ucdi4p3czoc"),
-		"storagemarket":    MustParseCid("bafk2bzacecnsibyil62jfq2gbkoe6c2epehfcrxzjmqjnwz7kxab2hkbu3lks"),
-		"storageminer":     MustParseCid("bafk2bzacedzw4vkrt3sdkhagpvn62pknyyjkcrzewncvtvae5qgwe6ulzx4a4"),
-		"storagepower":     MustParseCid("bafk2bzacedxgadibot6nzvripqt3z5shvjsoscupinejnsvswq4cbeskblwyy"),
-		"system":           MustParseCid("bafk2bzacedm24avrmp5o5odhpad43qeglooflygwh4ah7qnzbij2h4c3v6cge"),
-		"verifiedregistry": MustParseCid("bafk2bzaceapq3j6ww3ofytwq3pz3obumaqsyg3wrm6tksdh7op23a72co3rya"),
+		"account":          MustParseCid("bafk2bzacedv3nqh7an5mruvymqd3yfo4llb2fkplfyuygoyjmw6zvms3getk6"),
+		"cron":             MustParseCid("bafk2bzacebavz62zzbji2titwdal4gynm5izzpinvqxcuqzx2pcfazemknw56"),
+		"datacap":          MustParseCid("bafk2bzacebtexhugokrbrftjrf5wyisv2kmz6gjngn5btzb2jcwi5rswlwswo"),
+		"eam":              MustParseCid("bafk2bzacecejdlqwa4owqjx6vd7szgsl7eliwme4xkggch6qmdz4egei7ugrq"),
+		"embryo":           MustParseCid("bafk2bzaceax2tehd7m42kxf3z56hjj67buzucn5cj2456daz5yj4ai5txs2r4"),
+		"ethaccount":       MustParseCid("bafk2bzacedk3tsjwvjmvublhroesm7jwg7oymydo7zg35zfrqm327ojeizkoi"),
+		"evm":              MustParseCid("bafk2bzacedgtmzatizm3l6e5qis7lzuodq2ky5brjladxxocsws2hbp2fgqzc"),
+		"init":             MustParseCid("bafk2bzaceaevlnwyust4hjmmqx2owyy3x3pdmonjtqlwilfqxy4vidz32cbaq"),
+		"multisig":         MustParseCid("bafk2bzacea6qbjyvq7uo66priz6maqluwjt7dfljv5xmzbm5guumqdmpak6ta"),
+		"paymentchannel":   MustParseCid("bafk2bzacebcc5vdwkwizjjipy5mnk5ymneititrm7g6bcolvvnejys75qk7xg"),
+		"reward":           MustParseCid("bafk2bzaceaycrdfmsayqyd5c6lxy6wevpkey57hrzukg7bcmctrccajzhl3oi"),
+		"storagemarket":    MustParseCid("bafk2bzacecgpuwjbzvscr4stwclatt52xepd5yhcv3yzr6sfoijefiyi2blbu"),
+		"storageminer":     MustParseCid("bafk2bzacedb77qv4zajpgjylvpuyephiffhavd4iujbmc7s2epkgbbkaijozg"),
+		"storagepower":     MustParseCid("bafk2bzacealijkzu3qcehojibkth7kkhbi4v5ilxm6g5vhdn3apb3dfwuqgta"),
+		"system":           MustParseCid("bafk2bzaceb3i3oqv5plkzrakukaphr2nq3q5sk55hmilmznfyshmthg7ybduq"),
+		"verifiedregistry": MustParseCid("bafk2bzaceb5n547gmp6idmulnlnxm3hoa3ib6x3yuzoilhim3r4u4acodka7e"),
 	},
 }, {
 	Network:     "testing-fake-proofs",
@ -380,22 +386,23 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 }, {
 	Network:     "testing-fake-proofs",
 	Version:     10,
-	ManifestCid: MustParseCid("bafy2bzacea4irr2oxhclwt4mvtrevbzb7mbqddcebjz7bkqjq6eoflpfhencc"),
+	ManifestCid: MustParseCid("bafy2bzacebqopajwertdqzuklkqudhqh5coa6zhbj4zhkqkumlhjtn7gyzb3k"),
 	Actors: map[string]cid.Cid{
-		"account":          MustParseCid("bafk2bzaceba6me5ipkcijuhyypnzjydhv3ebi2ctailar7mtzlk4vk3rbxfee"),
-		"cron":             MustParseCid("bafk2bzacea6k2mai2xnakygqvbigivfrvv5q7d34qrzjv2crkqtwbjxnxmkbe"),
-		"datacap":          MustParseCid("bafk2bzaceah4oxcgck6bcfkzctm2klpvmltyidq7uxnlkcap6ypi3lnkcvrqk"),
-		"eam":              MustParseCid("bafk2bzacedjtkvocrnkrot2oztsfrxtpwl32wwbmbkrjfbbm4xipwzrhhxn5c"),
-		"embryo":           MustParseCid("bafk2bzacebj2mj5zlcs3yjlgpbznzistfjkdlwaoncjziliqrxqavvz4dcvnk"),
-		"evm":              MustParseCid("bafk2bzaced6vhabkr2ojpjzsybrq5yvksjzpjk6yei6fwobkwwydlj5f473pw"),
-		"init":             MustParseCid("bafk2bzaceaib3o5e7wop7kwjirgpferqarmngrgjkur2yhdnwplctidpxsgme"),
-		"multisig":         MustParseCid("bafk2bzaced4z3awacxumq6yr33a3adu2legb7colahgvqpmigs3fvvjxs3byc"),
-		"paymentchannel":   MustParseCid("bafk2bzaceb6mfi24mpzt7qlkratj2tdtqo7aia67zcztuslrxcjaycz6fnai6"),
-		"reward":           MustParseCid("bafk2bzacebngh5kwtem4ncarpjtxhs4rwyoficttkgxlsjtiz5ucdi4p3czoc"),
-		"storagemarket":    MustParseCid("bafk2bzacecnsibyil62jfq2gbkoe6c2epehfcrxzjmqjnwz7kxab2hkbu3lks"),
-		"storageminer":     MustParseCid("bafk2bzaceb4grddnw54gczgcdak5a2gqvwed66mhibbug6qu4jy35bf45jltg"),
-		"storagepower":     MustParseCid("bafk2bzacedp2dnbk4bg3hhaeztre4q3jv7eqs267rlafszpggb2njjn3x5eru"),
-		"system":           MustParseCid("bafk2bzacedm24avrmp5o5odhpad43qeglooflygwh4ah7qnzbij2h4c3v6cge"),
-		"verifiedregistry": MustParseCid("bafk2bzaceapq3j6ww3ofytwq3pz3obumaqsyg3wrm6tksdh7op23a72co3rya"),
+		"account":          MustParseCid("bafk2bzacedv3nqh7an5mruvymqd3yfo4llb2fkplfyuygoyjmw6zvms3getk6"),
+		"cron":             MustParseCid("bafk2bzacebavz62zzbji2titwdal4gynm5izzpinvqxcuqzx2pcfazemknw56"),
+		"datacap":          MustParseCid("bafk2bzacebtexhugokrbrftjrf5wyisv2kmz6gjngn5btzb2jcwi5rswlwswo"),
+		"eam":              MustParseCid("bafk2bzacecejdlqwa4owqjx6vd7szgsl7eliwme4xkggch6qmdz4egei7ugrq"),
+		"embryo":           MustParseCid("bafk2bzaceax2tehd7m42kxf3z56hjj67buzucn5cj2456daz5yj4ai5txs2r4"),
+		"ethaccount":       MustParseCid("bafk2bzacedk3tsjwvjmvublhroesm7jwg7oymydo7zg35zfrqm327ojeizkoi"),
+		"evm":              MustParseCid("bafk2bzacedgtmzatizm3l6e5qis7lzuodq2ky5brjladxxocsws2hbp2fgqzc"),
+		"init":             MustParseCid("bafk2bzaceaevlnwyust4hjmmqx2owyy3x3pdmonjtqlwilfqxy4vidz32cbaq"),
+		"multisig":         MustParseCid("bafk2bzacea6qbjyvq7uo66priz6maqluwjt7dfljv5xmzbm5guumqdmpak6ta"),
+		"paymentchannel":   MustParseCid("bafk2bzacebcc5vdwkwizjjipy5mnk5ymneititrm7g6bcolvvnejys75qk7xg"),
+		"reward":           MustParseCid("bafk2bzaceaycrdfmsayqyd5c6lxy6wevpkey57hrzukg7bcmctrccajzhl3oi"),
+		"storagemarket":    MustParseCid("bafk2bzacecgpuwjbzvscr4stwclatt52xepd5yhcv3yzr6sfoijefiyi2blbu"),
+		"storageminer":     MustParseCid("bafk2bzacecka5zpyelv62iuqya6vfbhabhqc4qtugpe7po6kayy2v4yntzrl2"),
+		"storagepower":     MustParseCid("bafk2bzacearjt7hf56on3qotxaxacrz3vqbdckuxf32m6azhu56oisi3j62xo"),
+		"system":           MustParseCid("bafk2bzaceb3i3oqv5plkzrakukaphr2nq3q5sk55hmilmznfyshmthg7ybduq"),
+		"verifiedregistry": MustParseCid("bafk2bzaceb5n547gmp6idmulnlnxm3hoa3ib6x3yuzoilhim3r4u4acodka7e"),
 	},
 }}
--- a/build/builtin_actors_test.go
+++ b/build/builtin_actors_test.go
@ -6,6 +6,7 @@ import (
 	"github.com/stretchr/testify/require"

 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/actors"
@ -26,7 +27,7 @@ func TestRegistration(t *testing.T) {
 		require.True(t, found)
 		require.True(t, manifestCid.Defined())

-		for _, key := range actors.GetBuiltinActorsKeys(av) {
+		for _, key := range manifest.GetBuiltinActorsKeys(av) {
 			actorCid, found := actors.GetActorCodeID(av, key)
 			require.True(t, found)
 			name, version, found := actors.GetActorMetaByCode(actorCid)
--- a/build/openrpc/full.json.gz
+++ b/build/openrpc/full.json.gz
--- a/chain/actors/actor_cids.go
+++ b/chain/actors/actor_cids.go
@ -5,6 +5,7 @@ import (
 	"golang.org/x/xerrors"

 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
 	builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
@ -28,7 +29,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) {
 	// Actors V7 and lower
 	switch name {

-	case AccountKey:
+	case manifest.AccountKey:
 		switch av {

 		case actorstypes.Version0:
@ -53,7 +54,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) {
 			return builtin7.AccountActorCodeID, true
 		}

-	case CronKey:
+	case manifest.CronKey:
 		switch av {

 		case actorstypes.Version0:
@ -78,7 +79,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) {
 			return builtin7.CronActorCodeID, true
 		}

-	case InitKey:
+	case manifest.InitKey:
 		switch av {

 		case actorstypes.Version0:
@ -103,7 +104,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) {
 			return builtin7.InitActorCodeID, true
 		}

-	case MarketKey:
+	case manifest.MarketKey:
 		switch av {

 		case actorstypes.Version0:
@ -128,7 +129,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) {
 			return builtin7.StorageMarketActorCodeID, true
 		}

-	case MinerKey:
+	case manifest.MinerKey:
 		switch av {

 		case actorstypes.Version0:
@ -153,7 +154,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) {
 			return builtin7.StorageMinerActorCodeID, true
 		}

-	case MultisigKey:
+	case manifest.MultisigKey:
 		switch av {

 		case actorstypes.Version0:
@ -178,7 +179,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) {
 			return builtin7.MultisigActorCodeID, true
 		}

-	case PaychKey:
+	case manifest.PaychKey:
 		switch av {

 		case actorstypes.Version0:
@ -203,7 +204,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) {
 			return builtin7.PaymentChannelActorCodeID, true
 		}

-	case PowerKey:
+	case manifest.PowerKey:
 		switch av {

 		case actorstypes.Version0:
@ -228,7 +229,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) {
 			return builtin7.StoragePowerActorCodeID, true
 		}

-	case RewardKey:
+	case manifest.RewardKey:
 		switch av {

 		case actorstypes.Version0:
@ -253,7 +254,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) {
 			return builtin7.RewardActorCodeID, true
 		}

-	case SystemKey:
+	case manifest.SystemKey:
 		switch av {

 		case actorstypes.Version0:
@ -278,7 +279,7 @@ func GetActorCodeID(av actorstypes.Version, name string) (cid.Cid, bool) {
 			return builtin7.SystemActorCodeID, true
 		}

-	case VerifregKey:
+	case manifest.VerifregKey:
 		switch av {

 		case actorstypes.Version0:
@ -314,7 +315,7 @@ func GetActorCodeIDs(av actorstypes.Version) (map[string]cid.Cid, error) {
 		return cids, nil
 	}

-	actorsKeys := GetBuiltinActorsKeys(av)
+	actorsKeys := manifest.GetBuiltinActorsKeys(av)
 	synthCids := make(map[string]cid.Cid)

 	for _, key := range actorsKeys {
--- a/chain/actors/builtin/account/account.go
+++ b/chain/actors/builtin/account/account.go
@ -8,6 +8,7 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	builtin10 "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/go-state-types/cbor"
+	"github.com/filecoin-project/go-state-types/manifest"
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
 	builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
@ -25,7 +26,7 @@ var Methods = builtin10.MethodsAccount

 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
-		if name != actors.AccountKey {
+		if name != manifest.AccountKey {
 			return nil, xerrors.Errorf("actor code is not account: %s", name)
 		}

--- a/chain/actors/builtin/account/actor.go.template
+++ b/chain/actors/builtin/account/actor.go.template
@ -11,6 +11,7 @@ import (

 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"
+	"github.com/filecoin-project/go-state-types/manifest"

 {{range .versions}}
    {{if (le . 7)}}
@ -24,7 +25,7 @@ var Methods = builtin{{.latestVersion}}.MethodsAccount

 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
-       if name != actors.AccountKey {
+       if name != manifest.AccountKey {
          return nil, xerrors.Errorf("actor code is not account: %s", name)
       }

--- a/chain/actors/builtin/account/state.go.template
+++ b/chain/actors/builtin/account/state.go.template
@ -9,6 +9,7 @@ import (

 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/actors"
+	"github.com/filecoin-project/go-state-types/manifest"

 {{if (le .v 7)}}
 	account{{.v}} "github.com/filecoin-project/specs-actors{{.import}}actors/builtin/account"
@ -48,7 +49,7 @@ func (s *state{{.v}}) GetState() interface{} {
 }

 func (s *state{{.v}}) ActorKey() string {
-    return actors.AccountKey
+    return manifest.AccountKey
 }

 func (s *state{{.v}}) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/account/v0.go
+++ b/chain/actors/builtin/account/v0.go
@ -7,6 +7,7 @@ import (

 	"github.com/filecoin-project/go-address"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	account0 "github.com/filecoin-project/specs-actors/actors/builtin/account"

 	"github.com/filecoin-project/lotus/chain/actors"
@ -44,7 +45,7 @@ func (s *state0) GetState() interface{} {
 }

 func (s *state0) ActorKey() string {
-	return actors.AccountKey
+	return manifest.AccountKey
 }

 func (s *state0) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/account/v10.go
+++ b/chain/actors/builtin/account/v10.go
@ -8,6 +8,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	account10 "github.com/filecoin-project/go-state-types/builtin/v10/account"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@ -44,7 +45,7 @@ func (s *state10) GetState() interface{} {
 }

 func (s *state10) ActorKey() string {
-	return actors.AccountKey
+	return manifest.AccountKey
 }

 func (s *state10) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/account/v2.go
+++ b/chain/actors/builtin/account/v2.go
@ -7,6 +7,7 @@ import (

 	"github.com/filecoin-project/go-address"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	account2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/account"

 	"github.com/filecoin-project/lotus/chain/actors"
@ -44,7 +45,7 @@ func (s *state2) GetState() interface{} {
 }

 func (s *state2) ActorKey() string {
-	return actors.AccountKey
+	return manifest.AccountKey
 }

 func (s *state2) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/account/v3.go
+++ b/chain/actors/builtin/account/v3.go
@ -7,6 +7,7 @@ import (

 	"github.com/filecoin-project/go-address"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	account3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/account"

 	"github.com/filecoin-project/lotus/chain/actors"
@ -44,7 +45,7 @@ func (s *state3) GetState() interface{} {
 }

 func (s *state3) ActorKey() string {
-	return actors.AccountKey
+	return manifest.AccountKey
 }

 func (s *state3) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/account/v4.go
+++ b/chain/actors/builtin/account/v4.go
@ -7,6 +7,7 @@ import (

 	"github.com/filecoin-project/go-address"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	account4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/account"

 	"github.com/filecoin-project/lotus/chain/actors"
@ -44,7 +45,7 @@ func (s *state4) GetState() interface{} {
 }

 func (s *state4) ActorKey() string {
-	return actors.AccountKey
+	return manifest.AccountKey
 }

 func (s *state4) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/account/v5.go
+++ b/chain/actors/builtin/account/v5.go
@ -7,6 +7,7 @@ import (

 	"github.com/filecoin-project/go-address"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	account5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/account"

 	"github.com/filecoin-project/lotus/chain/actors"
@ -44,7 +45,7 @@ func (s *state5) GetState() interface{} {
 }

 func (s *state5) ActorKey() string {
-	return actors.AccountKey
+	return manifest.AccountKey
 }

 func (s *state5) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/account/v6.go
+++ b/chain/actors/builtin/account/v6.go
@ -7,6 +7,7 @@ import (

 	"github.com/filecoin-project/go-address"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	account6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/account"

 	"github.com/filecoin-project/lotus/chain/actors"
@ -44,7 +45,7 @@ func (s *state6) GetState() interface{} {
 }

 func (s *state6) ActorKey() string {
-	return actors.AccountKey
+	return manifest.AccountKey
 }

 func (s *state6) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/account/v7.go
+++ b/chain/actors/builtin/account/v7.go
@ -7,6 +7,7 @@ import (

 	"github.com/filecoin-project/go-address"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	account7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/account"

 	"github.com/filecoin-project/lotus/chain/actors"
@ -44,7 +45,7 @@ func (s *state7) GetState() interface{} {
 }

 func (s *state7) ActorKey() string {
-	return actors.AccountKey
+	return manifest.AccountKey
 }

 func (s *state7) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/account/v8.go
+++ b/chain/actors/builtin/account/v8.go
@ -8,6 +8,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	account8 "github.com/filecoin-project/go-state-types/builtin/v8/account"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@ -44,7 +45,7 @@ func (s *state8) GetState() interface{} {
 }

 func (s *state8) ActorKey() string {
-	return actors.AccountKey
+	return manifest.AccountKey
 }

 func (s *state8) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/account/v9.go
+++ b/chain/actors/builtin/account/v9.go
@ -8,6 +8,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	account9 "github.com/filecoin-project/go-state-types/builtin/v9/account"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@ -44,7 +45,7 @@ func (s *state9) GetState() interface{} {
 }

 func (s *state9) ActorKey() string {
-	return actors.AccountKey
+	return manifest.AccountKey
 }

 func (s *state9) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/builtin.go
+++ b/chain/actors/builtin/builtin.go
@ -10,6 +10,7 @@ import (
 	"github.com/filecoin-project/go-state-types/builtin"
 	smoothingtypes "github.com/filecoin-project/go-state-types/builtin/v8/util/smoothing"
 	minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner"
+	"github.com/filecoin-project/go-state-types/manifest"
 	"github.com/filecoin-project/go-state-types/proof"
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
@ -165,7 +166,7 @@ func IsAccountActor(c cid.Cid) bool {
 func IsStorageMinerActor(c cid.Cid) bool {
 	name, _, ok := actors.GetActorMetaByCode(c)
 	if ok {
-		return name == actors.MinerKey
+		return name == manifest.MinerKey
 	}

 	if c == builtin0.StorageMinerActorCodeID {
@ -202,7 +203,7 @@ func IsStorageMinerActor(c cid.Cid) bool {
 func IsMultisigActor(c cid.Cid) bool {
 	name, _, ok := actors.GetActorMetaByCode(c)
 	if ok {
-		return name == actors.MultisigKey
+		return name == manifest.MultisigKey
 	}

 	if c == builtin0.MultisigActorCodeID {
@ -273,6 +274,24 @@ func IsPaymentChannelActor(c cid.Cid) bool {
 	return false
 }

+func IsEmbryoActor(c cid.Cid) bool {
+	name, _, ok := actors.GetActorMetaByCode(c)
+	if ok {
+		return name == "embryo"
+	}
+
+	return false
+}
+
+func IsEthAccountActor(c cid.Cid) bool {
+	name, _, ok := actors.GetActorMetaByCode(c)
+	if ok {
+		return name == "ethaccount"
+	}
+
+	return false
+}
+
 func makeAddress(addr string) address.Address {
 	ret, err := address.NewFromString(addr)
 	if err != nil {
--- a/chain/actors/builtin/builtin.go.template
+++ b/chain/actors/builtin/builtin.go.template
@ -15,6 +15,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/proof"
    "github.com/filecoin-project/go-state-types/builtin"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"

@ -107,7 +108,7 @@ func IsAccountActor(c cid.Cid) bool {
 func IsStorageMinerActor(c cid.Cid) bool {
 	name, _, ok := actors.GetActorMetaByCode(c)
    if ok {
-    	return name == actors.MinerKey
+    	return name == manifest.MinerKey
 	}

 	{{range .versions}}
@ -123,7 +124,7 @@ func IsStorageMinerActor(c cid.Cid) bool {
 func IsMultisigActor(c cid.Cid) bool {
 	name, _, ok := actors.GetActorMetaByCode(c)
    if ok {
-    	return name == actors.MultisigKey
+    	return name == manifest.MultisigKey
 	}

 	{{range .versions}}
@ -152,6 +153,24 @@ func IsPaymentChannelActor(c cid.Cid) bool {
 	return false
 }

+func IsEmbryoActor(c cid.Cid) bool {
+	name, _, ok := actors.GetActorMetaByCode(c)
+    if ok {
+    	return name == "embryo"
+	}
+
+	return false
+}
+
+func IsEthAccountActor(c cid.Cid) bool {
+	name, _, ok := actors.GetActorMetaByCode(c)
+    if ok {
+    	return name == "ethaccount"
+	}
+
+	return false
+}
+
 func makeAddress(addr string) address.Address {
 	ret, err := address.NewFromString(addr)
 	if err != nil {
--- a/chain/actors/builtin/cron/actor.go.template
+++ b/chain/actors/builtin/cron/actor.go.template
@ -7,6 +7,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"golang.org/x/xerrors"
 	"github.com/filecoin-project/lotus/chain/types"
+	"github.com/filecoin-project/go-state-types/manifest"

 {{range .versions}}
    {{if (le . 7)}}
@ -18,7 +19,7 @@ import (

 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
-       if name != actors.CronKey {
+       if name != manifest.CronKey {
          return nil, xerrors.Errorf("actor code is not cron: %s", name)
       }

--- a/chain/actors/builtin/cron/cron.go
+++ b/chain/actors/builtin/cron/cron.go
@ -6,6 +6,7 @@ import (

 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	builtin10 "github.com/filecoin-project/go-state-types/builtin"
+	"github.com/filecoin-project/go-state-types/manifest"
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
 	builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
@ -21,7 +22,7 @@ import (

 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
-		if name != actors.CronKey {
+		if name != manifest.CronKey {
 			return nil, xerrors.Errorf("actor code is not cron: %s", name)
 		}

--- a/chain/actors/builtin/cron/state.go.template
+++ b/chain/actors/builtin/cron/state.go.template
@ -7,6 +7,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/actors"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"

 {{if (le .v 7)}}
 	cron{{.v}} "github.com/filecoin-project/specs-actors{{.import}}actors/builtin/cron"
@ -42,7 +43,7 @@ func (s *state{{.v}}) GetState() interface{} {
 }

 func (s *state{{.v}}) ActorKey() string {
-    return actors.CronKey
+    return manifest.CronKey
 }

 func (s *state{{.v}}) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/cron/v0.go
+++ b/chain/actors/builtin/cron/v0.go
@ -6,6 +6,7 @@ import (
 	"github.com/ipfs/go-cid"

 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	cron0 "github.com/filecoin-project/specs-actors/actors/builtin/cron"

 	"github.com/filecoin-project/lotus/chain/actors"
@ -39,7 +40,7 @@ func (s *state0) GetState() interface{} {
 }

 func (s *state0) ActorKey() string {
-	return actors.CronKey
+	return manifest.CronKey
 }

 func (s *state0) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/cron/v10.go
+++ b/chain/actors/builtin/cron/v10.go
@ -7,6 +7,7 @@ import (

 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	cron10 "github.com/filecoin-project/go-state-types/builtin/v10/cron"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@ -39,7 +40,7 @@ func (s *state10) GetState() interface{} {
 }

 func (s *state10) ActorKey() string {
-	return actors.CronKey
+	return manifest.CronKey
 }

 func (s *state10) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/cron/v2.go
+++ b/chain/actors/builtin/cron/v2.go
@ -6,6 +6,7 @@ import (
 	"github.com/ipfs/go-cid"

 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	cron2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/cron"

 	"github.com/filecoin-project/lotus/chain/actors"
@ -39,7 +40,7 @@ func (s *state2) GetState() interface{} {
 }

 func (s *state2) ActorKey() string {
-	return actors.CronKey
+	return manifest.CronKey
 }

 func (s *state2) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/cron/v3.go
+++ b/chain/actors/builtin/cron/v3.go
@ -6,6 +6,7 @@ import (
 	"github.com/ipfs/go-cid"

 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	cron3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/cron"

 	"github.com/filecoin-project/lotus/chain/actors"
@ -39,7 +40,7 @@ func (s *state3) GetState() interface{} {
 }

 func (s *state3) ActorKey() string {
-	return actors.CronKey
+	return manifest.CronKey
 }

 func (s *state3) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/cron/v4.go
+++ b/chain/actors/builtin/cron/v4.go
@ -6,6 +6,7 @@ import (
 	"github.com/ipfs/go-cid"

 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	cron4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/cron"

 	"github.com/filecoin-project/lotus/chain/actors"
@ -39,7 +40,7 @@ func (s *state4) GetState() interface{} {
 }

 func (s *state4) ActorKey() string {
-	return actors.CronKey
+	return manifest.CronKey
 }

 func (s *state4) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/cron/v5.go
+++ b/chain/actors/builtin/cron/v5.go
@ -6,6 +6,7 @@ import (
 	"github.com/ipfs/go-cid"

 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	cron5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/cron"

 	"github.com/filecoin-project/lotus/chain/actors"
@ -39,7 +40,7 @@ func (s *state5) GetState() interface{} {
 }

 func (s *state5) ActorKey() string {
-	return actors.CronKey
+	return manifest.CronKey
 }

 func (s *state5) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/cron/v6.go
+++ b/chain/actors/builtin/cron/v6.go
@ -6,6 +6,7 @@ import (
 	"github.com/ipfs/go-cid"

 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	cron6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/cron"

 	"github.com/filecoin-project/lotus/chain/actors"
@ -39,7 +40,7 @@ func (s *state6) GetState() interface{} {
 }

 func (s *state6) ActorKey() string {
-	return actors.CronKey
+	return manifest.CronKey
 }

 func (s *state6) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/cron/v7.go
+++ b/chain/actors/builtin/cron/v7.go
@ -6,6 +6,7 @@ import (
 	"github.com/ipfs/go-cid"

 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	cron7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/cron"

 	"github.com/filecoin-project/lotus/chain/actors"
@ -39,7 +40,7 @@ func (s *state7) GetState() interface{} {
 }

 func (s *state7) ActorKey() string {
-	return actors.CronKey
+	return manifest.CronKey
 }

 func (s *state7) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/cron/v8.go
+++ b/chain/actors/builtin/cron/v8.go
@ -7,6 +7,7 @@ import (

 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	cron8 "github.com/filecoin-project/go-state-types/builtin/v8/cron"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@ -39,7 +40,7 @@ func (s *state8) GetState() interface{} {
 }

 func (s *state8) ActorKey() string {
-	return actors.CronKey
+	return manifest.CronKey
 }

 func (s *state8) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/cron/v9.go
+++ b/chain/actors/builtin/cron/v9.go
@ -7,6 +7,7 @@ import (

 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	cron9 "github.com/filecoin-project/go-state-types/builtin/v9/cron"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@ -39,7 +40,7 @@ func (s *state9) GetState() interface{} {
 }

 func (s *state9) ActorKey() string {
-	return actors.CronKey
+	return manifest.CronKey
 }

 func (s *state9) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/datacap/actor.go.template
+++ b/chain/actors/builtin/datacap/actor.go.template
@ -14,6 +14,7 @@ import (
    "github.com/filecoin-project/lotus/chain/actors"
    "github.com/filecoin-project/lotus/chain/actors/adt"
    "github.com/filecoin-project/lotus/chain/types"
+	"github.com/filecoin-project/go-state-types/manifest"
 )

 var (
@ -23,7 +24,7 @@ var (

 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
-       if name != actors.DatacapKey {
+       if name != manifest.DatacapKey {
          return nil, xerrors.Errorf("actor code is not datacap: %s", name)
       }

--- a/chain/actors/builtin/datacap/datacap.go
+++ b/chain/actors/builtin/datacap/datacap.go
@ -9,6 +9,7 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	builtin10 "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/go-state-types/cbor"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@ -22,7 +23,7 @@ var (

 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
-		if name != actors.DatacapKey {
+		if name != manifest.DatacapKey {
 			return nil, xerrors.Errorf("actor code is not datacap: %s", name)
 		}

--- a/chain/actors/builtin/datacap/state.go.template
+++ b/chain/actors/builtin/datacap/state.go.template
@ -12,6 +12,7 @@ import (

 	datacap{{.v}} "github.com/filecoin-project/go-state-types/builtin{{.import}}datacap"
 	adt{{.v}} "github.com/filecoin-project/go-state-types/builtin{{.import}}util/adt"
+	"github.com/filecoin-project/go-state-types/manifest"
 )

 var _ State = (*state{{.v}})(nil)
@ -63,7 +64,7 @@ func (s *state{{.v}}) VerifiedClientDataCap(addr address.Address) (bool, abi.Sto
 }

 func (s *state{{.v}}) ActorKey() string {
-    return actors.DatacapKey
+    return manifest.DatacapKey
 }

 func (s *state{{.v}}) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/datacap/v10.go
+++ b/chain/actors/builtin/datacap/v10.go
@ -10,6 +10,7 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	datacap10 "github.com/filecoin-project/go-state-types/builtin/v10/datacap"
 	adt10 "github.com/filecoin-project/go-state-types/builtin/v10/util/adt"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@ -64,7 +65,7 @@ func (s *state10) VerifiedClientDataCap(addr address.Address) (bool, abi.Storage
 }

 func (s *state10) ActorKey() string {
-	return actors.DatacapKey
+	return manifest.DatacapKey
 }

 func (s *state10) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/datacap/v9.go
+++ b/chain/actors/builtin/datacap/v9.go
@ -10,6 +10,7 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	datacap9 "github.com/filecoin-project/go-state-types/builtin/v9/datacap"
 	adt9 "github.com/filecoin-project/go-state-types/builtin/v9/util/adt"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@ -64,7 +65,7 @@ func (s *state9) VerifiedClientDataCap(addr address.Address) (bool, abi.StorageP
 }

 func (s *state9) ActorKey() string {
-	return actors.DatacapKey
+	return manifest.DatacapKey
 }

 func (s *state9) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/embryo.go
+++ b/chain/actors/builtin/embryo.go
@ -1,12 +0,0 @@
-package builtin
-
-import (
-	"github.com/ipfs/go-cid"
-
-	"github.com/filecoin-project/lotus/chain/actors"
-)
-
-func IsEmbryo(c cid.Cid) bool {
-	name, _, ok := actors.GetActorMetaByCode(c)
-	return ok && name == "embryo"
-}
--- a/chain/actors/builtin/evm/actor.go.template
+++ b/chain/actors/builtin/evm/actor.go.template
@ -10,6 +10,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"
+	"github.com/filecoin-project/go-state-types/manifest"

 	builtin{{.latestVersion}} "github.com/filecoin-project/go-state-types/builtin"
 )
@ -18,7 +19,7 @@ var Methods = builtin{{.latestVersion}}.MethodsEVM

 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
-       if name != actors.EvmKey {
+       if name != manifest.EvmKey {
          return nil, xerrors.Errorf("actor code is not evm: %s", name)
       }

--- a/chain/actors/builtin/evm/evm.go
+++ b/chain/actors/builtin/evm/evm.go
@ -7,6 +7,7 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	builtin10 "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/go-state-types/cbor"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@ -17,7 +18,7 @@ var Methods = builtin10.MethodsEVM

 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
-		if name != actors.EvmKey {
+		if name != manifest.EvmKey {
 			return nil, xerrors.Errorf("actor code is not evm: %s", name)
 		}

--- a/chain/actors/builtin/init/actor.go.template
+++ b/chain/actors/builtin/init/actor.go.template
@ -13,6 +13,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
+	"github.com/filecoin-project/go-state-types/manifest"
 {{range .versions}}
    {{if (le . 7)}}
 	    builtin{{.}} "github.com/filecoin-project/specs-actors{{import .}}actors/builtin"
@ -28,7 +29,7 @@ var (

 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
-       if name != actors.InitKey {
+       if name != manifest.InitKey {
          return nil, xerrors.Errorf("actor code is not init: %s", name)
       }

--- a/chain/actors/builtin/init/init.go
+++ b/chain/actors/builtin/init/init.go
@ -9,6 +9,7 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	builtin10 "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/go-state-types/cbor"
+	"github.com/filecoin-project/go-state-types/manifest"
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
 	builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
@ -30,7 +31,7 @@ var (

 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
-		if name != actors.InitKey {
+		if name != manifest.InitKey {
 			return nil, xerrors.Errorf("actor code is not init: %s", name)
 		}

--- a/chain/actors/builtin/init/state.go.template
+++ b/chain/actors/builtin/init/state.go.template
@ -14,6 +14,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
+	"github.com/filecoin-project/go-state-types/manifest"

 {{if (le .v 7)}}
    {{if (ge .v 3)}}
@ -148,7 +149,7 @@ func (s *state{{.v}}) AddressMapHashFunction() func(input []byte) []byte {
 }

 func (s *state{{.v}}) ActorKey() string {
-    return actors.InitKey
+    return manifest.InitKey
 }

 func (s *state{{.v}}) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/init/v0.go
+++ b/chain/actors/builtin/init/v0.go
@ -11,6 +11,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	init0 "github.com/filecoin-project/specs-actors/actors/builtin/init"
 	adt0 "github.com/filecoin-project/specs-actors/actors/util/adt"

@ -128,7 +129,7 @@ func (s *state0) AddressMapHashFunction() func(input []byte) []byte {
 }

 func (s *state0) ActorKey() string {
-	return actors.InitKey
+	return manifest.InitKey
 }

 func (s *state0) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/init/v10.go
+++ b/chain/actors/builtin/init/v10.go
@ -14,6 +14,7 @@ import (
 	builtin10 "github.com/filecoin-project/go-state-types/builtin"
 	init10 "github.com/filecoin-project/go-state-types/builtin/v10/init"
 	adt10 "github.com/filecoin-project/go-state-types/builtin/v10/util/adt"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@ -129,7 +130,7 @@ func (s *state10) AddressMapHashFunction() func(input []byte) []byte {
 }

 func (s *state10) ActorKey() string {
-	return actors.InitKey
+	return manifest.InitKey
 }

 func (s *state10) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/init/v2.go
+++ b/chain/actors/builtin/init/v2.go
@ -11,6 +11,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	init2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/init"
 	adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"

@ -128,7 +129,7 @@ func (s *state2) AddressMapHashFunction() func(input []byte) []byte {
 }

 func (s *state2) ActorKey() string {
-	return actors.InitKey
+	return manifest.InitKey
 }

 func (s *state2) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/init/v3.go
+++ b/chain/actors/builtin/init/v3.go
@ -11,6 +11,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
 	init3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/init"
 	adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt"
@ -129,7 +130,7 @@ func (s *state3) AddressMapHashFunction() func(input []byte) []byte {
 }

 func (s *state3) ActorKey() string {
-	return actors.InitKey
+	return manifest.InitKey
 }

 func (s *state3) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/init/v4.go
+++ b/chain/actors/builtin/init/v4.go
@ -11,6 +11,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
 	init4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/init"
 	adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt"
@ -129,7 +130,7 @@ func (s *state4) AddressMapHashFunction() func(input []byte) []byte {
 }

 func (s *state4) ActorKey() string {
-	return actors.InitKey
+	return manifest.InitKey
 }

 func (s *state4) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/init/v5.go
+++ b/chain/actors/builtin/init/v5.go
@ -11,6 +11,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
 	init5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/init"
 	adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt"
@ -129,7 +130,7 @@ func (s *state5) AddressMapHashFunction() func(input []byte) []byte {
 }

 func (s *state5) ActorKey() string {
-	return actors.InitKey
+	return manifest.InitKey
 }

 func (s *state5) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/init/v6.go
+++ b/chain/actors/builtin/init/v6.go
@ -11,6 +11,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	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"
@ -129,7 +130,7 @@ func (s *state6) AddressMapHashFunction() func(input []byte) []byte {
 }

 func (s *state6) ActorKey() string {
-	return actors.InitKey
+	return manifest.InitKey
 }

 func (s *state6) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/init/v7.go
+++ b/chain/actors/builtin/init/v7.go
@ -11,6 +11,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
 	init7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/init"
 	adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt"
@ -129,7 +130,7 @@ func (s *state7) AddressMapHashFunction() func(input []byte) []byte {
 }

 func (s *state7) ActorKey() string {
-	return actors.InitKey
+	return manifest.InitKey
 }

 func (s *state7) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/init/v8.go
+++ b/chain/actors/builtin/init/v8.go
@ -14,6 +14,7 @@ import (
 	builtin8 "github.com/filecoin-project/go-state-types/builtin"
 	init8 "github.com/filecoin-project/go-state-types/builtin/v8/init"
 	adt8 "github.com/filecoin-project/go-state-types/builtin/v8/util/adt"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@ -129,7 +130,7 @@ func (s *state8) AddressMapHashFunction() func(input []byte) []byte {
 }

 func (s *state8) ActorKey() string {
-	return actors.InitKey
+	return manifest.InitKey
 }

 func (s *state8) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/init/v9.go
+++ b/chain/actors/builtin/init/v9.go
@ -14,6 +14,7 @@ import (
 	builtin9 "github.com/filecoin-project/go-state-types/builtin"
 	init9 "github.com/filecoin-project/go-state-types/builtin/v9/init"
 	adt9 "github.com/filecoin-project/go-state-types/builtin/v9/util/adt"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@ -129,7 +130,7 @@ func (s *state9) AddressMapHashFunction() func(input []byte) []byte {
 }

 func (s *state9) ActorKey() string {
-	return actors.InitKey
+	return manifest.InitKey
 }

 func (s *state9) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/market/actor.go.template
+++ b/chain/actors/builtin/market/actor.go.template
@ -13,6 +13,7 @@ import (
 	"github.com/filecoin-project/go-state-types/big"
 	"github.com/filecoin-project/go-state-types/cbor"
 	cbg "github.com/whyrusleeping/cbor-gen"
+	"github.com/filecoin-project/go-state-types/manifest"

 	markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market"
 	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
@ -36,7 +37,7 @@ var (

 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
-       if name != actors.MarketKey {
+       if name != manifest.MarketKey {
          return nil, xerrors.Errorf("actor code is not market: %s", name)
       }

--- a/chain/actors/builtin/market/market.go
+++ b/chain/actors/builtin/market/market.go
@ -15,6 +15,7 @@ import (
 	markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market"
 	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
 	"github.com/filecoin-project/go-state-types/cbor"
+	"github.com/filecoin-project/go-state-types/manifest"
 	"github.com/filecoin-project/go-state-types/network"
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
@ -36,7 +37,7 @@ var (

 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
-		if name != actors.MarketKey {
+		if name != manifest.MarketKey {
 			return nil, xerrors.Errorf("actor code is not market: %s", name)
 		}

--- a/chain/actors/builtin/market/state.go.template
+++ b/chain/actors/builtin/market/state.go.template
@ -20,6 +20,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/types"
 	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
+	"github.com/filecoin-project/go-state-types/manifest"

 {{if (le .v 7)}}
 	market{{.v}} "github.com/filecoin-project/specs-actors{{.import}}actors/builtin/market"
@ -394,7 +395,7 @@ func (s *state{{.v}}) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifreg


 func (s *state{{.v}}) ActorKey() string {
-    return actors.MarketKey
+    return manifest.MarketKey
 }

 func (s *state{{.v}}) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/market/v0.go
+++ b/chain/actors/builtin/market/v0.go
@ -12,6 +12,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
+	"github.com/filecoin-project/go-state-types/manifest"
 	market0 "github.com/filecoin-project/specs-actors/actors/builtin/market"
 	adt0 "github.com/filecoin-project/specs-actors/actors/util/adt"

@ -312,7 +313,7 @@ func (s *state0) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes
 }

 func (s *state0) ActorKey() string {
-	return actors.MarketKey
+	return manifest.MarketKey
 }

 func (s *state0) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/market/v10.go
+++ b/chain/actors/builtin/market/v10.go
@ -18,6 +18,7 @@ import (
 	adt10 "github.com/filecoin-project/go-state-types/builtin/v10/util/adt"
 	markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market"
 	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@ -359,7 +360,7 @@ func (s *state10) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtype
 }

 func (s *state10) ActorKey() string {
-	return actors.MarketKey
+	return manifest.MarketKey
 }

 func (s *state10) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/market/v2.go
+++ b/chain/actors/builtin/market/v2.go
@ -12,6 +12,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
+	"github.com/filecoin-project/go-state-types/manifest"
 	market2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/market"
 	adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"

@ -312,7 +313,7 @@ func (s *state2) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes
 }

 func (s *state2) ActorKey() string {
-	return actors.MarketKey
+	return manifest.MarketKey
 }

 func (s *state2) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/market/v3.go
+++ b/chain/actors/builtin/market/v3.go
@ -12,6 +12,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
+	"github.com/filecoin-project/go-state-types/manifest"
 	market3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/market"
 	adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt"

@ -307,7 +308,7 @@ func (s *state3) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes
 }

 func (s *state3) ActorKey() string {
-	return actors.MarketKey
+	return manifest.MarketKey
 }

 func (s *state3) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/market/v4.go
+++ b/chain/actors/builtin/market/v4.go
@ -12,6 +12,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
+	"github.com/filecoin-project/go-state-types/manifest"
 	market4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/market"
 	adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt"

@ -307,7 +308,7 @@ func (s *state4) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes
 }

 func (s *state4) ActorKey() string {
-	return actors.MarketKey
+	return manifest.MarketKey
 }

 func (s *state4) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/market/v5.go
+++ b/chain/actors/builtin/market/v5.go
@ -12,6 +12,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
+	"github.com/filecoin-project/go-state-types/manifest"
 	market5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/market"
 	adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt"

@ -307,7 +308,7 @@ func (s *state5) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes
 }

 func (s *state5) ActorKey() string {
-	return actors.MarketKey
+	return manifest.MarketKey
 }

 func (s *state5) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/market/v6.go
+++ b/chain/actors/builtin/market/v6.go
@ -14,6 +14,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
+	"github.com/filecoin-project/go-state-types/manifest"
 	market6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/market"
 	adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt"

@ -325,7 +326,7 @@ func (s *state6) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes
 }

 func (s *state6) ActorKey() string {
-	return actors.MarketKey
+	return manifest.MarketKey
 }

 func (s *state6) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/market/v7.go
+++ b/chain/actors/builtin/market/v7.go
@ -14,6 +14,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
+	"github.com/filecoin-project/go-state-types/manifest"
 	market7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/market"
 	adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt"

@ -325,7 +326,7 @@ func (s *state7) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes
 }

 func (s *state7) ActorKey() string {
-	return actors.MarketKey
+	return manifest.MarketKey
 }

 func (s *state7) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/market/v8.go
+++ b/chain/actors/builtin/market/v8.go
@ -17,6 +17,7 @@ import (
 	adt8 "github.com/filecoin-project/go-state-types/builtin/v8/util/adt"
 	markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market"
 	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@ -342,7 +343,7 @@ func (s *state8) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes
 }

 func (s *state8) ActorKey() string {
-	return actors.MarketKey
+	return manifest.MarketKey
 }

 func (s *state8) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/market/v9.go
+++ b/chain/actors/builtin/market/v9.go
@ -18,6 +18,7 @@ import (
 	markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market"
 	adt9 "github.com/filecoin-project/go-state-types/builtin/v9/util/adt"
 	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@ -359,7 +360,7 @@ func (s *state9) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes
 }

 func (s *state9) ActorKey() string {
-	return actors.MarketKey
+	return manifest.MarketKey
 }

 func (s *state9) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/miner/actor.go.template
+++ b/chain/actors/builtin/miner/actor.go.template
@ -18,6 +18,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"
 	minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner"
+	"github.com/filecoin-project/go-state-types/manifest"

 {{range .versions}}
    {{if (le . 7)}}
@ -28,7 +29,7 @@ import (

 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
-       if name != actors.MinerKey {
+       if name != manifest.MinerKey {
          return nil, xerrors.Errorf("actor code is not miner: %s", name)
       }

@ -79,6 +80,7 @@ type State interface {
 	LockedFunds() (LockedFunds, error)
 	FeeDebt() (abi.TokenAmount, error)

+    // Returns nil, nil if sector is not found
 	GetSector(abi.SectorNumber) (*SectorOnChainInfo, error)
 	FindSector(abi.SectorNumber) (*SectorLocation, error)
 	GetSectorExpiration(abi.SectorNumber) (*SectorExpiration, error)
--- a/chain/actors/builtin/miner/miner.go
+++ b/chain/actors/builtin/miner/miner.go
@ -12,6 +12,7 @@ import (
 	minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner"
 	"github.com/filecoin-project/go-state-types/cbor"
 	"github.com/filecoin-project/go-state-types/dline"
+	"github.com/filecoin-project/go-state-types/manifest"
 	"github.com/filecoin-project/go-state-types/network"
 	"github.com/filecoin-project/go-state-types/proof"
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
@ -29,7 +30,7 @@ import (

 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
-		if name != actors.MinerKey {
+		if name != manifest.MinerKey {
 			return nil, xerrors.Errorf("actor code is not miner: %s", name)
 		}

@ -127,6 +128,7 @@ type State interface {
 	LockedFunds() (LockedFunds, error)
 	FeeDebt() (abi.TokenAmount, error)

+	// Returns nil, nil if sector is not found
 	GetSector(abi.SectorNumber) (*SectorOnChainInfo, error)
 	FindSector(abi.SectorNumber) (*SectorLocation, error)
 	GetSectorExpiration(abi.SectorNumber) (*SectorExpiration, error)
--- a/chain/actors/builtin/miner/state.go.template
+++ b/chain/actors/builtin/miner/state.go.template
@ -18,6 +18,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/actors"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"

 {{if (le .v 7)}}
    {{if (ge .v 3)}}
@ -100,6 +101,7 @@ func (s *state{{.v}}) PreCommitDeposits() (abi.TokenAmount, error) {
 	return s.State.PreCommitDeposits, nil
 }

+// Returns nil, nil if sector is not found
 func (s *state{{.v}}) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) {
 	info, ok, err := s.State.GetSector(s.store, num)
 	if !ok || err != nil {
@ -613,7 +615,7 @@ func (s *state{{.v}}) GetState() interface{} {
 }

 func (s *state{{.v}}) ActorKey() string {
-    return actors.MinerKey
+    return manifest.MinerKey
 }

 func (s *state{{.v}}) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/miner/v0.go
+++ b/chain/actors/builtin/miner/v0.go
@ -15,6 +15,7 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/big"
 	"github.com/filecoin-project/go-state-types/dline"
+	"github.com/filecoin-project/go-state-types/manifest"
 	miner0 "github.com/filecoin-project/specs-actors/actors/builtin/miner"
 	adt0 "github.com/filecoin-project/specs-actors/actors/util/adt"

@ -90,6 +91,7 @@ func (s *state0) PreCommitDeposits() (abi.TokenAmount, error) {
 	return s.State.PreCommitDeposits, nil
 }

+// Returns nil, nil if sector is not found
 func (s *state0) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) {
 	info, ok, err := s.State.GetSector(s.store, num)
 	if !ok || err != nil {
@ -534,7 +536,7 @@ func (s *state0) GetState() interface{} {
 }

 func (s *state0) ActorKey() string {
-	return actors.MinerKey
+	return manifest.MinerKey
 }

 func (s *state0) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/miner/v10.go
+++ b/chain/actors/builtin/miner/v10.go
@ -17,6 +17,7 @@ import (
 	miner10 "github.com/filecoin-project/go-state-types/builtin/v10/miner"
 	adt10 "github.com/filecoin-project/go-state-types/builtin/v10/util/adt"
 	"github.com/filecoin-project/go-state-types/dline"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@ -90,6 +91,7 @@ func (s *state10) PreCommitDeposits() (abi.TokenAmount, error) {
 	return s.State.PreCommitDeposits, nil
 }

+// Returns nil, nil if sector is not found
 func (s *state10) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) {
 	info, ok, err := s.State.GetSector(s.store, num)
 	if !ok || err != nil {
@ -572,7 +574,7 @@ func (s *state10) GetState() interface{} {
 }

 func (s *state10) ActorKey() string {
-	return actors.MinerKey
+	return manifest.MinerKey
 }

 func (s *state10) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/miner/v2.go
+++ b/chain/actors/builtin/miner/v2.go
@ -14,6 +14,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/dline"
+	"github.com/filecoin-project/go-state-types/manifest"
 	miner2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner"
 	adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"

@ -89,6 +90,7 @@ func (s *state2) PreCommitDeposits() (abi.TokenAmount, error) {
 	return s.State.PreCommitDeposits, nil
 }

+// Returns nil, nil if sector is not found
 func (s *state2) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) {
 	info, ok, err := s.State.GetSector(s.store, num)
 	if !ok || err != nil {
@ -565,7 +567,7 @@ func (s *state2) GetState() interface{} {
 }

 func (s *state2) ActorKey() string {
-	return actors.MinerKey
+	return manifest.MinerKey
 }

 func (s *state2) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/miner/v3.go
+++ b/chain/actors/builtin/miner/v3.go
@ -14,6 +14,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/dline"
+	"github.com/filecoin-project/go-state-types/manifest"
 	builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
 	miner3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/miner"
 	adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt"
@ -90,6 +91,7 @@ func (s *state3) PreCommitDeposits() (abi.TokenAmount, error) {
 	return s.State.PreCommitDeposits, nil
 }

+// Returns nil, nil if sector is not found
 func (s *state3) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) {
 	info, ok, err := s.State.GetSector(s.store, num)
 	if !ok || err != nil {
@ -565,7 +567,7 @@ func (s *state3) GetState() interface{} {
 }

 func (s *state3) ActorKey() string {
-	return actors.MinerKey
+	return manifest.MinerKey
 }

 func (s *state3) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/miner/v4.go
+++ b/chain/actors/builtin/miner/v4.go
@ -14,6 +14,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/dline"
+	"github.com/filecoin-project/go-state-types/manifest"
 	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
 	miner4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/miner"
 	adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt"
@ -90,6 +91,7 @@ func (s *state4) PreCommitDeposits() (abi.TokenAmount, error) {
 	return s.State.PreCommitDeposits, nil
 }

+// Returns nil, nil if sector is not found
 func (s *state4) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) {
 	info, ok, err := s.State.GetSector(s.store, num)
 	if !ok || err != nil {
@ -565,7 +567,7 @@ func (s *state4) GetState() interface{} {
 }

 func (s *state4) ActorKey() string {
-	return actors.MinerKey
+	return manifest.MinerKey
 }

 func (s *state4) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/miner/v5.go
+++ b/chain/actors/builtin/miner/v5.go
@ -14,6 +14,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/dline"
+	"github.com/filecoin-project/go-state-types/manifest"
 	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
 	miner5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/miner"
 	adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt"
@ -90,6 +91,7 @@ func (s *state5) PreCommitDeposits() (abi.TokenAmount, error) {
 	return s.State.PreCommitDeposits, nil
 }

+// Returns nil, nil if sector is not found
 func (s *state5) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) {
 	info, ok, err := s.State.GetSector(s.store, num)
 	if !ok || err != nil {
@ -565,7 +567,7 @@ func (s *state5) GetState() interface{} {
 }

 func (s *state5) ActorKey() string {
-	return actors.MinerKey
+	return manifest.MinerKey
 }

 func (s *state5) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/miner/v6.go
+++ b/chain/actors/builtin/miner/v6.go
@ -14,6 +14,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/dline"
+	"github.com/filecoin-project/go-state-types/manifest"
 	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"
@ -90,6 +91,7 @@ func (s *state6) PreCommitDeposits() (abi.TokenAmount, error) {
 	return s.State.PreCommitDeposits, nil
 }

+// Returns nil, nil if sector is not found
 func (s *state6) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) {
 	info, ok, err := s.State.GetSector(s.store, num)
 	if !ok || err != nil {
@ -565,7 +567,7 @@ func (s *state6) GetState() interface{} {
 }

 func (s *state6) ActorKey() string {
-	return actors.MinerKey
+	return manifest.MinerKey
 }

 func (s *state6) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/miner/v7.go
+++ b/chain/actors/builtin/miner/v7.go
@ -14,6 +14,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/dline"
+	"github.com/filecoin-project/go-state-types/manifest"
 	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
 	miner7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner"
 	adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt"
@ -90,6 +91,7 @@ func (s *state7) PreCommitDeposits() (abi.TokenAmount, error) {
 	return s.State.PreCommitDeposits, nil
 }

+// Returns nil, nil if sector is not found
 func (s *state7) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) {
 	info, ok, err := s.State.GetSector(s.store, num)
 	if !ok || err != nil {
@ -566,7 +568,7 @@ func (s *state7) GetState() interface{} {
 }

 func (s *state7) ActorKey() string {
-	return actors.MinerKey
+	return manifest.MinerKey
 }

 func (s *state7) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/miner/v8.go
+++ b/chain/actors/builtin/miner/v8.go
@ -17,6 +17,7 @@ import (
 	miner8 "github.com/filecoin-project/go-state-types/builtin/v8/miner"
 	adt8 "github.com/filecoin-project/go-state-types/builtin/v8/util/adt"
 	"github.com/filecoin-project/go-state-types/dline"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@ -90,6 +91,7 @@ func (s *state8) PreCommitDeposits() (abi.TokenAmount, error) {
 	return s.State.PreCommitDeposits, nil
 }

+// Returns nil, nil if sector is not found
 func (s *state8) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) {
 	info, ok, err := s.State.GetSector(s.store, num)
 	if !ok || err != nil {
@ -566,7 +568,7 @@ func (s *state8) GetState() interface{} {
 }

 func (s *state8) ActorKey() string {
-	return actors.MinerKey
+	return manifest.MinerKey
 }

 func (s *state8) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/miner/v9.go
+++ b/chain/actors/builtin/miner/v9.go
@ -17,6 +17,7 @@ import (
 	miner9 "github.com/filecoin-project/go-state-types/builtin/v9/miner"
 	adt9 "github.com/filecoin-project/go-state-types/builtin/v9/util/adt"
 	"github.com/filecoin-project/go-state-types/dline"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@ -90,6 +91,7 @@ func (s *state9) PreCommitDeposits() (abi.TokenAmount, error) {
 	return s.State.PreCommitDeposits, nil
 }

+// Returns nil, nil if sector is not found
 func (s *state9) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) {
 	info, ok, err := s.State.GetSector(s.store, num)
 	if !ok || err != nil {
@ -572,7 +574,7 @@ func (s *state9) GetState() interface{} {
 }

 func (s *state9) ActorKey() string {
-	return actors.MinerKey
+	return manifest.MinerKey
 }

 func (s *state9) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/multisig/actor.go.template
+++ b/chain/actors/builtin/multisig/actor.go.template
@ -21,6 +21,7 @@ import (
 {{end}}

    builtintypes "github.com/filecoin-project/go-state-types/builtin"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@ -29,7 +30,7 @@ import (

 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
-       if name != actors.MultisigKey {
+       if name != manifest.MultisigKey {
          return nil, xerrors.Errorf("actor code is not multisig: %s", name)
       }

--- a/chain/actors/builtin/multisig/message.go.template
+++ b/chain/actors/builtin/multisig/message.go.template
@ -14,6 +14,7 @@ import (
        actorstypes "github.com/filecoin-project/go-state-types/actors"
        multisig{{.v}} "github.com/filecoin-project/go-state-types/builtin{{.import}}multisig"
        init{{.latestVersion}} "github.com/filecoin-project/go-state-types/builtin/v{{.latestVersion}}/init"
+	    "github.com/filecoin-project/go-state-types/manifest"
    {{end}}

    builtintypes "github.com/filecoin-project/go-state-types/builtin"
@ -68,7 +69,7 @@ func (m message{{.v}}) Create(
            ConstructorParams: enc,
        }
 	{{else}}
-        code, ok := actors.GetActorCodeID(actorstypes.Version{{.v}}, actors.MultisigKey)
+        code, ok := actors.GetActorCodeID(actorstypes.Version{{.v}}, manifest.MultisigKey)
        if !ok {
            return nil, xerrors.Errorf("failed to get multisig code ID")
        }
--- a/chain/actors/builtin/multisig/message10.go
+++ b/chain/actors/builtin/multisig/message10.go
@ -9,6 +9,7 @@ import (
 	builtintypes "github.com/filecoin-project/go-state-types/builtin"
 	init10 "github.com/filecoin-project/go-state-types/builtin/v10/init"
 	multisig10 "github.com/filecoin-project/go-state-types/builtin/v10/multisig"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
@ -50,7 +51,7 @@ func (m message10) Create(
 		return nil, actErr
 	}

-	code, ok := actors.GetActorCodeID(actorstypes.Version10, actors.MultisigKey)
+	code, ok := actors.GetActorCodeID(actorstypes.Version10, manifest.MultisigKey)
 	if !ok {
 		return nil, xerrors.Errorf("failed to get multisig code ID")
 	}
--- a/chain/actors/builtin/multisig/message8.go
+++ b/chain/actors/builtin/multisig/message8.go
@ -9,6 +9,7 @@ import (
 	builtintypes "github.com/filecoin-project/go-state-types/builtin"
 	init10 "github.com/filecoin-project/go-state-types/builtin/v10/init"
 	multisig8 "github.com/filecoin-project/go-state-types/builtin/v8/multisig"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
@ -50,7 +51,7 @@ func (m message8) Create(
 		return nil, actErr
 	}

-	code, ok := actors.GetActorCodeID(actorstypes.Version8, actors.MultisigKey)
+	code, ok := actors.GetActorCodeID(actorstypes.Version8, manifest.MultisigKey)
 	if !ok {
 		return nil, xerrors.Errorf("failed to get multisig code ID")
 	}
--- a/chain/actors/builtin/multisig/message9.go
+++ b/chain/actors/builtin/multisig/message9.go
@ -9,6 +9,7 @@ import (
 	builtintypes "github.com/filecoin-project/go-state-types/builtin"
 	init10 "github.com/filecoin-project/go-state-types/builtin/v10/init"
 	multisig9 "github.com/filecoin-project/go-state-types/builtin/v9/multisig"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
@ -50,7 +51,7 @@ func (m message9) Create(
 		return nil, actErr
 	}

-	code, ok := actors.GetActorCodeID(actorstypes.Version9, actors.MultisigKey)
+	code, ok := actors.GetActorCodeID(actorstypes.Version9, manifest.MultisigKey)
 	if !ok {
 		return nil, xerrors.Errorf("failed to get multisig code ID")
 	}
--- a/chain/actors/builtin/multisig/multisig.go
+++ b/chain/actors/builtin/multisig/multisig.go
@ -14,6 +14,7 @@ import (
 	builtintypes "github.com/filecoin-project/go-state-types/builtin"
 	msig10 "github.com/filecoin-project/go-state-types/builtin/v10/multisig"
 	"github.com/filecoin-project/go-state-types/cbor"
+	"github.com/filecoin-project/go-state-types/manifest"
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
 	builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
@ -29,7 +30,7 @@ import (

 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
-		if name != actors.MultisigKey {
+		if name != manifest.MultisigKey {
 			return nil, xerrors.Errorf("actor code is not multisig: %s", name)
 		}

--- a/chain/actors/builtin/multisig/state.go.template
+++ b/chain/actors/builtin/multisig/state.go.template
@ -15,6 +15,7 @@ import (

 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/actors"
+	"github.com/filecoin-project/go-state-types/manifest"

 {{if (le .v 7)}}
    {{if (ge .v 3)}}
@ -136,7 +137,7 @@ func (s *state{{.v}}) GetState() interface{} {
 }

 func (s *state{{.v}}) ActorKey() string {
-    return actors.MultisigKey
+    return manifest.MultisigKey
 }

 func (s *state{{.v}}) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/multisig/v0.go
+++ b/chain/actors/builtin/multisig/v0.go
@ -12,6 +12,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	msig0 "github.com/filecoin-project/specs-actors/actors/builtin/multisig"
 	adt0 "github.com/filecoin-project/specs-actors/actors/util/adt"

@ -119,7 +120,7 @@ func (s *state0) GetState() interface{} {
 }

 func (s *state0) ActorKey() string {
-	return actors.MultisigKey
+	return manifest.MultisigKey
 }

 func (s *state0) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/multisig/v10.go
+++ b/chain/actors/builtin/multisig/v10.go
@ -15,6 +15,7 @@ import (
 	builtin10 "github.com/filecoin-project/go-state-types/builtin"
 	msig10 "github.com/filecoin-project/go-state-types/builtin/v10/multisig"
 	adt10 "github.com/filecoin-project/go-state-types/builtin/v10/util/adt"
+	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@ -120,7 +121,7 @@ func (s *state10) GetState() interface{} {
 }

 func (s *state10) ActorKey() string {
-	return actors.MultisigKey
+	return manifest.MultisigKey
 }

 func (s *state10) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/multisig/v2.go
+++ b/chain/actors/builtin/multisig/v2.go
@ -12,6 +12,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	msig2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/multisig"
 	adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"

@ -119,7 +120,7 @@ func (s *state2) GetState() interface{} {
 }

 func (s *state2) ActorKey() string {
-	return actors.MultisigKey
+	return manifest.MultisigKey
 }

 func (s *state2) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/multisig/v3.go
+++ b/chain/actors/builtin/multisig/v3.go
@ -12,6 +12,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
 	msig3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/multisig"
 	adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt"
@ -120,7 +121,7 @@ func (s *state3) GetState() interface{} {
 }

 func (s *state3) ActorKey() string {
-	return actors.MultisigKey
+	return manifest.MultisigKey
 }

 func (s *state3) ActorVersion() actorstypes.Version {
--- a/chain/actors/builtin/multisig/v4.go
+++ b/chain/actors/builtin/multisig/v4.go
@ -12,6 +12,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
+	"github.com/filecoin-project/go-state-types/manifest"
 	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
 	msig4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/multisig"
 	adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt"
@ -120,7 +121,7 @@ func (s *state4) GetState() interface{} {
 }

 func (s *state4) ActorKey() string {
-	return actors.MultisigKey
+	return manifest.MultisigKey
 }

 func (s *state4) ActorVersion() actorstypes.Version {
--- a/Show More
+++ b/Show More