Merge pull request #10456 from filecoin-project/raulk/fix-eth-net_version

Merge pull request #10445 from filecoin-project/steb/skip-tipset-execution
Merge pull request #10409 from filecoin-project/asr/fix-eth-api-gateway
2023-03-13 11:51:29 +00:00 · 2023-03-13 11:51:16 +00:00 · 2023-03-13 11:50:56 +00:00 · 2023-03-13 11:41:48 +00:00
115 changed files with 1688 additions and 5152 deletions
@@ -719,9 +719,14 @@ workflows:
          target: "./itests/mempool_test.go"
      
      - test:
-          name: test-itest-migration
-          suite: itest-migration
-          target: "./itests/migration_test.go"
+          name: test-itest-migration_nv17
+          suite: itest-migration_nv17
+          target: "./itests/migration_nv17_test.go"
+      
+      - test:
+          name: test-itest-migration_nv18
+          suite: itest-migration_nv18
+          target: "./itests/migration_nv18_test.go"
      
      - test:
          name: test-itest-mpool_msg_uuid
@@ -1,220 +1,7 @@
 # Lotus changelog

-# v1.22.0-rc4 / 2023-04-17
-
-This is the fourth release candidate for MANDATORY 1.22.0 release of lotus.
-
-Diff from previous RCs:
- REVERT [Activation bug fix](https://github.com/filecoin-project/builtin-actors/issues/914) 
- REVERT [FIP 0052](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0052.md)
-
-Activation bug fix is reverted to reduce upgrade risk in order to expedite the upgrade. This is in hopes of helping improve recent chain quality degregadation along with other long syncing time related issues.  FIP 0052 requires the activation bug fix to maintain security invariants and so must also be reverted.
-
-# v1.22.0-rc1 / 2023-04-13
-
-
-This is the third release candidate for the upcoming MANDATORY 1.22.0 release of Lotus. This release will deliver the nv19 Lighting and nv20 Thunder network upgrade.
-
-Note that this release candidate sets the calibration upgrade epoch, and does NOT set the epoch at which mainnet will upgrade; that detail will be finalized in the 1.22.0 release.
-
-The Lighting and Thunder upgrade introduces the following Filecoin Improvement Proposals (FIPs), delivered by builtin-actors v11 (see actors [v11.0.0-rc.1](https://github.com/filecoin-project/builtin-actors/releases/tag/v11.0.0-rc1)):
-
- [FIP 0060](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0060.md) - Thirty day market deal maintenance interval
- [FIP 0061](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0061.md) - WindowPoSt grindability fix
- [FIP 0062](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0062.md) - Fallback method handler for multisig actor
- [FIP 0052](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0052.md) - Deals and sectors can be created and extended in 3.5 year intervals (+2 years from current params)
- [Activation bug fix](https://github.com/filecoin-project/builtin-actors/issues/914) - internal refactor of sector info fields fixing several outstanding bugs
-
-## Lighting and Thunder
-
-As you may have noticed, that we are doing a two-stage incremental network upgrades in this release. This essentially means that there will be two network versions rolled out together -- nv19 and nv20.
-The two stage roll out is required for FIP-0061 - which introduces a new proof that reduces the grindability of windowPoSt and furthur secures the network. At the first upgrade, the new proof type will start to be accepted by the protocol, while the second upgrade (nv20) marks the spot when the old proof type will no longer be accepted. This allows for a smooth rollover period during which both proof types are accepted. Lotus will start generating the new proof types immediately after the nv19 upgrade.
-This is something we've safely done before. The second upgrade is something of a "ghost" upgrade -- no migration runs, and no code changes, except that clients will start reporting the new network version of nv20 to the FVM.
-
-## Calibration nv19 Lighting and nv20 Thunder Upgrade
-
-This release candidate sets the calibration-net nv19 Lighting upgrade at epoch 489394, 2023-04-20T16:30:00Z and nv20 Thunder upgrade will be triggered automatically 11520 epoch later. The bundle the network will be using is [v10.0.0 actors](https://github.com/filecoin-project/builtin-actors/releases/tag/v10.0.0-rc.1)
-(located at `build/actors/v11.tar.zst`) upon/post migration, manifest CID `bafy2bzacedyne7vbddp2inj64ubztcvkmfkdnahwo353sltkqtsyzckioneuu`.
-
-# UNRELEASED
-
-## Execution Trace Format Changes
-
-Execution traces (returned from `lotus state exec-trace`, `lotus state replay`, etc.), has changed to account for changes introduced by the FVM. Specifically:
-
- The `Msg` field no longer matches the Filecoin message format as many of the message fields didn't make sense in on-chain sub-calls. Instead, it now has the fields `To`, `From`, `Value`, `Method`, `Params`, and `ParamsCodec` where `ParamsCodec` is a new field indicating the IPLD codec of the parameters.
-    - Importantly, the `Msg.CID` field has been removed. This field is still present in top-level invocation results, just not inside the execution trace itself.
- The `MsgRct` field no longer includes a `GasUsed` field and now has a `ReturnCodec` field to indicating the IPLD codec of the return value.
- The `Error` and `Duration` fields have been removed as these are not set by the FVM. The top-level message "invocation result" retains the `Error` and `Duration` fields, they've only been removed from the trace itself.
- Gas Charges no longer include "virtual" gas fields (those starting with `v...`) or source location information (`loc`) as neither field is set by the FVM.
-
-A note on "codecs": FVM parameters and return values are IPLD blocks where the "codec" specifies the data encoding. The codec will generally be one of:
-
- `0x51`, `0x71` - CBOR or DagCBOR. You should generally treat these as equivalent.
- `0x55` - Raw bytes.
- `0x00` - Nothing. If the codec is `0x00`, the parameter and/or return value should be empty and should be treated as "void" (not specified).
-
-<details>
-<summary>
-Old <code>ExecutionTrace</code>:
-</summary>
-
-```json
-{
-  "Msg": {
-    "Version": 0,
-    "To": "f01234",
-    "From": "f04321",
-    "Nonce": 1,
-    "Value": "0",
-    "GasLimit": 0,
-    "GasFeeCap": "1234",
-    "GasPremium": "1234",
-    "Method": 42,
-    "Params": "<base64-data-or-null>",
-    "CID": {
-        "/": "bafyxyz....."
-    },
-  },
-  "MsgRct": {
-    "ExitCode": 0,
-    "Return": "<base64-data-or-null>",
-    "GasUsed": 12345,
-  },
-  "Error": "",
-  "Duration": 568191845,
-  "GasCharges": [
-    {
-      "Name": "OnMethodInvocation",
-      "loc": null,
-      "tg": 23856,
-      "cg": 23856,
-      "sg": 0,
-      "vtg": 0,
-      "vcg": 0,
-      "vsg": 0,
-      "tt": 0
-    },
-    {
-      "Name": "wasm_exec",
-      "loc": null,
-      "tg": 1764,
-      "cg": 1764,
-      "sg": 0,
-      "vtg": 0,
-      "vcg": 0,
-      "vsg": 0,
-      "tt": 0
-    },
-    {
-      "Name": "OnSyscall",
-      "loc": null,
-      "tg": 14000,
-      "cg": 14000,
-      "sg": 0,
-      "vtg": 0,
-      "vcg": 0,
-      "vsg": 0,
-      "tt": 0
-    },
-  ],
-  "Subcalls": [
-    {
-      "Msg": { },
-      "MsgRct": { },
-      "Error": "",
-      "Duration": 1235,
-      "GasCharges": [],
-      "Subcalls": [],
-    },
-  ]
-}
-```
-</details>
-
-<details>
-<summary>
-New <code>ExecutionTrace</code>:
-</summary>
-
-```json
-{
-  "Msg": {
-    "To": "f01234",
-    "From": "f04321",
-    "Value": "0",
-    "Method": 42,
-    "Params": "<base64-data-or-null>",
-    "ParamsCodec": 81
-  },
-  "MsgRct": {
-    "ExitCode": 0,
-    "Return": "<base64-data-or-null>",
-    "ReturnCodec": 81
-  },
-  "GasCharges": [
-    {
-      "Name": "OnMethodInvocation",
-      "loc": null,
-      "tg": 23856,
-      "cg": 23856,
-      "tt": 0
-    },
-    {
-      "Name": "wasm_exec",
-      "loc": null,
-      "tg": 1764,
-      "cg": 1764,
-      "sg": 0,
-      "tt": 0
-    },
-    {
-      "Name": "OnSyscall",
-      "loc": null,
-      "tg": 14000,
-      "cg": 14000,
-      "sg": 0,
-      "tt": 0
-    },
-  ],
-  "Subcalls": [
-    {
-      "Msg": { },
-      "MsgRct": { },
-      "GasCharges": [],
-      "Subcalls": [],
-    },
-  ]
-}
-```
-
-</details>
-
-# v1.20.4 / 2023-03-17
-
-This is a patch release intended to alleviate performance issues reported by some users since the nv18 upgrade. 
-The primary change is to update the FFI to allow for FVM parallelism of 4 by default, and make this user-configurable.
-through the `LOTUS_FVM_CONCURRENCY` env var. 
-
-Users with higher memory specs can experiment with setting `LOTUS_FVM_CONCURRENCY` to higher values, up to 48, to allow for more concurrent FVM execution.
-
-## Bug fixes
-
- Splitstore: Don't enforce walking receipt tree during compaction #10505
- fix: build: drop drand incentinet servers #10506 
-
-## Improvement
-
- chore: update ffi to increase execution parallelism #10503 
-
-# v1.20.3 / 2023-03-09
-
-A 🐈 stepped on the ⌨️ and made a mistake while resolving conflicts 😨. This releases only includes #10439 to fix that mistake. v1.20.2 is retracted - Please skip v1.20.2 and only update to v1.20.3!!!
-
 # v1.20.2 / 2023-03-09

-DO NOT USE: Use 1.20.3 instead!
-
 This is a HIGHLY RECOMMENDED patch release for node operators/API service providers that run ETH RPC service and an optional release for Storage Providers.

 ## Bug fixes
@@ -88,8 +88,6 @@ type Gateway interface {
 	EthGetMessageCidByTransactionHash(ctx context.Context, txHash *ethtypes.EthHash) (*cid.Cid, error)
 	EthGetTransactionCount(ctx context.Context, sender ethtypes.EthAddress, blkOpt string) (ethtypes.EthUint64, error)
 	EthGetTransactionReceipt(ctx context.Context, txHash ethtypes.EthHash) (*EthTxReceipt, error)
-	EthGetTransactionByBlockHashAndIndex(ctx context.Context, blkHash ethtypes.EthHash, txIndex ethtypes.EthUint64) (ethtypes.EthTx, error)
-	EthGetTransactionByBlockNumberAndIndex(ctx context.Context, blkNum ethtypes.EthUint64, txIndex ethtypes.EthUint64) (ethtypes.EthTx, error)
 	EthGetCode(ctx context.Context, address ethtypes.EthAddress, blkOpt string) (ethtypes.EthBytes, error)
 	EthGetStorageAt(ctx context.Context, address ethtypes.EthAddress, position ethtypes.EthBytes, blkParam string) (ethtypes.EthBytes, error)
 	EthGetBalance(ctx context.Context, address ethtypes.EthAddress, blkParam string) (ethtypes.EthBigInt, error)
@@ -152,8 +152,8 @@ func init() {
 	addExample(map[string]int{"name": 42})
 	addExample(map[string]time.Time{"name": time.Unix(1615243938, 0).UTC()})
 	addExample(&types.ExecutionTrace{
-		Msg:    ExampleValue("init", reflect.TypeOf(types.MessageTrace{}), nil).(types.MessageTrace),
-		MsgRct: ExampleValue("init", reflect.TypeOf(types.ReturnTrace{}), nil).(types.ReturnTrace),
+		Msg:    ExampleValue("init", reflect.TypeOf(&types.Message{}), nil).(*types.Message),
+		MsgRct: ExampleValue("init", reflect.TypeOf(&types.MessageReceipt{}), nil).(*types.MessageReceipt),
 	})
 	addExample(map[string]types.Actor{
 		"t01236": ExampleValue("init", reflect.TypeOf(types.Actor{}), nil).(types.Actor),
@@ -688,10 +688,6 @@ type GatewayMethods struct {

 	EthGetStorageAt func(p0 context.Context, p1 ethtypes.EthAddress, p2 ethtypes.EthBytes, p3 string) (ethtypes.EthBytes, error) ``

-	EthGetTransactionByBlockHashAndIndex func(p0 context.Context, p1 ethtypes.EthHash, p2 ethtypes.EthUint64) (ethtypes.EthTx, error) ``
-
-	EthGetTransactionByBlockNumberAndIndex func(p0 context.Context, p1 ethtypes.EthUint64, p2 ethtypes.EthUint64) (ethtypes.EthTx, error) ``
-
 	EthGetTransactionByHash func(p0 context.Context, p1 *ethtypes.EthHash) (*ethtypes.EthTx, error) ``

 	EthGetTransactionCount func(p0 context.Context, p1 ethtypes.EthAddress, p2 string) (ethtypes.EthUint64, error) ``
@@ -4395,28 +4391,6 @@ func (s *GatewayStub) EthGetStorageAt(p0 context.Context, p1 ethtypes.EthAddress
 	return *new(ethtypes.EthBytes), ErrNotSupported
 }

-func (s *GatewayStruct) EthGetTransactionByBlockHashAndIndex(p0 context.Context, p1 ethtypes.EthHash, p2 ethtypes.EthUint64) (ethtypes.EthTx, error) {
-	if s.Internal.EthGetTransactionByBlockHashAndIndex == nil {
-		return *new(ethtypes.EthTx), ErrNotSupported
-	}
-	return s.Internal.EthGetTransactionByBlockHashAndIndex(p0, p1, p2)
-}
-
-func (s *GatewayStub) EthGetTransactionByBlockHashAndIndex(p0 context.Context, p1 ethtypes.EthHash, p2 ethtypes.EthUint64) (ethtypes.EthTx, error) {
-	return *new(ethtypes.EthTx), ErrNotSupported
-}
-
-func (s *GatewayStruct) EthGetTransactionByBlockNumberAndIndex(p0 context.Context, p1 ethtypes.EthUint64, p2 ethtypes.EthUint64) (ethtypes.EthTx, error) {
-	if s.Internal.EthGetTransactionByBlockNumberAndIndex == nil {
-		return *new(ethtypes.EthTx), ErrNotSupported
-	}
-	return s.Internal.EthGetTransactionByBlockNumberAndIndex(p0, p1, p2)
-}
-
-func (s *GatewayStub) EthGetTransactionByBlockNumberAndIndex(p0 context.Context, p1 ethtypes.EthUint64, p2 ethtypes.EthUint64) (ethtypes.EthTx, error) {
-	return *new(ethtypes.EthTx), ErrNotSupported
-}
-
 func (s *GatewayStruct) EthGetTransactionByHash(p0 context.Context, p1 *ethtypes.EthHash) (*ethtypes.EthTx, error) {
 	if s.Internal.EthGetTransactionByHash == nil {
 		return nil, ErrNotSupported
@@ -339,8 +339,6 @@ type ForkUpgradeParams struct {
 	UpgradeSkyrHeight          abi.ChainEpoch
 	UpgradeSharkHeight         abi.ChainEpoch
 	UpgradeHyggeHeight         abi.ChainEpoch
-	UpgradeLightningHeight     abi.ChainEpoch
-	UpgradeThunderHeight       abi.ChainEpoch
 }

 type NonceMapType map[address.Address]uint64
@@ -960,7 +960,7 @@ func (s *SplitStore) walkChain(ts *types.TipSet, inclState, inclMsgs abi.ChainEp
 					return xerrors.Errorf("error walking messages (cid: %s): %w", hdr.Messages, err)
 				}

-				if err := s.walkObjectIncomplete(hdr.ParentMessageReceipts, visitor, fHot, stopWalk); err != nil {
+				if err := s.walkObject(hdr.ParentMessageReceipts, visitor, fHot); err != nil {
 					return xerrors.Errorf("error walking message receipts (cid: %s): %w", hdr.ParentMessageReceipts, err)
 				}
 			}
@@ -1,2 +1,2 @@
-/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWEwwFTMAi8rMnVX4fzih9pW5xZgTMbcacAFPinaT1g4wo
-/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWSJ8KShJSdW8cqz29K7k3AR5frbAaun8gdW3ELFV3T4Ck
+/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWCa1wgMMBB9JjA2kYqaN1v5uh7xvcsc2gQJBHzPp7G57H
+/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWD6fCvo1dyci6wsjTLyv7eJK73pCVz6RCQjbtPvbc8LYw
@@ -49,10 +49,10 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 		"verifiedregistry": MustParseCid("bafk2bzacecjkesz766626ab4svnzpq3jfs26a75vfktlfaku5fjdao2eyiqyq"),
 	},
 }, {
-	Network: "butterflynet",
-	Version: 10,
-
-	ManifestCid: MustParseCid("bafy2bzaceckjhsggacixv2d377zfdcnuio4hzkveprio3xnhm3gohi3zy3zco"),
+	Network:      "butterflynet",
+	Version:      10,
+	BundleGitTag: "v10.0.0",
+	ManifestCid:  MustParseCid("bafy2bzaceckjhsggacixv2d377zfdcnuio4hzkveprio3xnhm3gohi3zy3zco"),
 	Actors: map[string]cid.Cid{
 		"account":          MustParseCid("bafk2bzacedkt3uzgugcsdrcsyfvizcpyr5eshltmienbyhjne2t7t3ktkihny"),
 		"cron":             MustParseCid("bafk2bzacecrehknegmfnhmhwy2g43cw52mvl7ptfpp44syus4iph7az7uveuq"),
@@ -71,29 +71,6 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 		"system":           MustParseCid("bafk2bzacebojf25kc5yo7gskdbdgg5f52oppej2jp6nknzlvrww4ue5vkddd2"),
 		"verifiedregistry": MustParseCid("bafk2bzaceavue3zekq4wmvttck2vgxlcensrsgh5niu5qhna2owejycorftcc"),
 	},
-}, {
-	Network:      "butterflynet",
-	Version:      11,
-	BundleGitTag: "v11.0.0-rc2",
-	ManifestCid:  MustParseCid("bafy2bzaceajj76ms4q2ka3ckzj2iiifl7ewxqdpolshcmhml32sqwolrmsh6e"),
-	Actors: map[string]cid.Cid{
-		"account":          MustParseCid("bafk2bzacecsf7v7mm4osq7cqbygyudg5zkwqbpbkmi3iluakugzvbd2cuucfw"),
-		"cron":             MustParseCid("bafk2bzacediqvwudrujh7ejowrcumrnara7k2fonr35vulnggpwwwh3o32pmu"),
-		"datacap":          MustParseCid("bafk2bzaceb7jkx5kxwwbkw5ehz63sq2b6urouegn4cdczlziaw5ea44u67ock"),
-		"eam":              MustParseCid("bafk2bzacebq2zzzkcra7ahantiq7xlkgcrkoq2azmeqpwhoie5gxcxhurbdp2"),
-		"ethaccount":       MustParseCid("bafk2bzacebrtwz4nyl3nkgjfpvtqjrjixnbujkr72fwzf5bqhpqfo4hgbjqo2"),
-		"evm":              MustParseCid("bafk2bzacecoxcwxbukue76b4rrqhnjywgzjdlhbbemma4kqdzalpkgtdpog7q"),
-		"init":             MustParseCid("bafk2bzacebwfs5wna2dculc4mpl4a25cjrmguoscbebeb5g5yft4ntfpku7cu"),
-		"multisig":         MustParseCid("bafk2bzaceavnestm7obwlj3moeewcnuomzigfzys4lt26s3l3psjeligf4hju"),
-		"paymentchannel":   MustParseCid("bafk2bzaceb4vefsbgswrciqo26wnacvqwpicqjfyicwsdjmv4rbcc4zeae72g"),
-		"placeholder":      MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"),
-		"reward":           MustParseCid("bafk2bzacedyl4uerjbw3tu5mcgkn7ftvr3j3poy4uv5tuzyuvcdinjb75cz3w"),
-		"storagemarket":    MustParseCid("bafk2bzacechvhqru32tw7zii2raii3upjrkybiubepjtartyhzibnac57gxyo"),
-		"storageminer":     MustParseCid("bafk2bzacedu6tzfpxwzqym3z2j252d57gqj3jduap7ijf5mczvhmsirs6wxfs"),
-		"storagepower":     MustParseCid("bafk2bzacebdoeoiayvshg4zaxygmpuituux3ccd4gxfl3ile7ckpsyy7kpnms"),
-		"system":           MustParseCid("bafk2bzaceatn5cj3jqmrug65ur26jhrzcgmishv5hjfswvsyxsieccchhwies"),
-		"verifiedregistry": MustParseCid("bafk2bzacecjshlgoyim3r2uvhtjthu5udxpq5fvjy4pmpi3sy4v6a4chjvb4k"),
-	},
 }, {
 	Network: "calibrationnet",
 	Version: 8,
@@ -132,10 +109,10 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 		"verifiedregistry": MustParseCid("bafk2bzacebh7dj6j7yi5vadh7lgqjtq42qi2uq4n6zy2g5vjeathacwn2tscu"),
 	},
 }, {
-	Network: "calibrationnet",
-	Version: 10,
-
-	ManifestCid: MustParseCid("bafy2bzaced25ta3j6ygs34roprilbtb3f6mxifyfnm7z7ndquaruxzdq3y7lo"),
+	Network:      "calibrationnet",
+	Version:      10,
+	BundleGitTag: "v10.0.0-rc.1",
+	ManifestCid:  MustParseCid("bafy2bzaced25ta3j6ygs34roprilbtb3f6mxifyfnm7z7ndquaruxzdq3y7lo"),
 	Actors: map[string]cid.Cid{
 		"account":          MustParseCid("bafk2bzacebhfuz3sv7duvk653544xsxhdn4lsmy7ol7k6gdgancyctvmd7lnq"),
 		"cron":             MustParseCid("bafk2bzacecw2yjb6ysieffa7lk7xd32b3n4ssowvafolt7eq52lp6lk4lkhji"),
@@ -154,29 +131,6 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 		"system":           MustParseCid("bafk2bzacea4mtukm5zazygkdbgdf26cpnwwif5n2no7s6tknpxlwy6fpq3mug"),
 		"verifiedregistry": MustParseCid("bafk2bzacec67wuchq64k7kgrujguukjvdlsl24pgighqdx5vgjhyk6bycrwnc"),
 	},
-}, {
-	Network:      "calibrationnet",
-	Version:      11,
-	BundleGitTag: "v11.0.0-rc2",
-	ManifestCid:  MustParseCid("bafy2bzacedhuowetjy2h4cxnijz2l64h4mzpk5m256oywp4evarpono3cjhco"),
-	Actors: map[string]cid.Cid{
-		"account":          MustParseCid("bafk2bzacebor5mnjnsav34cmm5pcd3dy4wubbv4wtcrvba7depy3sct7ie4sy"),
-		"cron":             MustParseCid("bafk2bzacebetehhedh55alfn4rcx2mhjhvuiustxlhtxc3drkemnpttws5eqw"),
-		"datacap":          MustParseCid("bafk2bzaced6uhmrh5jjexhw4lco4ipesi2iutl7uupnyspgmnbydyo3amtu4i"),
-		"eam":              MustParseCid("bafk2bzacea6wzcnflfnaxqnwydoghh7ezg5au32ew3bnzljzpiw6fimhlpoiu"),
-		"ethaccount":       MustParseCid("bafk2bzacedrbpvjvyzif2cjxosm4pliyq2m6wzndvrg7r6hzdhixplzvgubbw"),
-		"evm":              MustParseCid("bafk2bzaceabftmhejmvjvpzmbsv4cvaew6v5juj5sqtq7cfijugwsnahnsy5w"),
-		"init":             MustParseCid("bafk2bzaceduyjd35y7o2lhvevtysqf45rp5ot7x5f36q6iond6dyiz6773g5q"),
-		"multisig":         MustParseCid("bafk2bzacebcb72fmbpocetnzgni2wnbrduamlqx6fl3yelrlzu7id6bu5ib5g"),
-		"paymentchannel":   MustParseCid("bafk2bzaceazwhm63kyp47pste5i5acnuhosrgythyagf3kc5clogiqqx6vkzk"),
-		"placeholder":      MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"),
-		"reward":           MustParseCid("bafk2bzacecp7xo5ev46y64zr5osnn5fxo7itpoqw235tcfv6eo4rymzdemet2"),
-		"storagemarket":    MustParseCid("bafk2bzacedjt5mueomasx7dijooxnwxsbtzu2dj2ppp45rtle4kiinkmgzeei"),
-		"storageminer":     MustParseCid("bafk2bzacebkjnjp5okqjhjxzft5qkuv36u4tz7inawseiwi2kw4j43xpxvhpm"),
-		"storagepower":     MustParseCid("bafk2bzaced2qsypqwore3jrdtaesh4itst2fyeepdsozvtffc2pianzmphdum"),
-		"system":           MustParseCid("bafk2bzacedqvik2n3phnj3cni3h2k5mtvz43nyq7mdmv7k7euejysvajywdug"),
-		"verifiedregistry": MustParseCid("bafk2bzaceceoo5jlom2zweh7kpye2vkj33wgqnkjshlsw2neemqkfg5g2rmvg"),
-	},
 }, {
 	Network: "caterpillarnet",
 	Version: 8,
@@ -224,10 +178,10 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 		"verifiedregistry": MustParseCid("bafk2bzacebzndvdqtdck2y35smcxezldgh6nm6rbkj3g3fmiknsgg2uah235y"),
 	},
 }, {
-	Network: "caterpillarnet",
-	Version: 10,
-
-	ManifestCid: MustParseCid("bafy2bzaceajftd7jawqnwf4kzkotksrwy6ag7mu2apkvypzrrmxboheuum5oi"),
+	Network:      "caterpillarnet",
+	Version:      10,
+	BundleGitTag: "v10.0.0",
+	ManifestCid:  MustParseCid("bafy2bzaceajftd7jawqnwf4kzkotksrwy6ag7mu2apkvypzrrmxboheuum5oi"),
 	Actors: map[string]cid.Cid{
 		"account":          MustParseCid("bafk2bzacecsbx4tovnr5x2ifcpqbpx33oht74mgtvmaauzrqcq2wnm7prr7ak"),
 		"cron":             MustParseCid("bafk2bzacecpzfajba6m4v4ty342jw6lcu6n63bwtldmzko733wpd2q5jzfdvu"),
@@ -246,29 +200,6 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 		"system":           MustParseCid("bafk2bzacecfivztuulqqv4o5oyvvvrkblwix4hqt24pqru6ivnpioefhuhria"),
 		"verifiedregistry": MustParseCid("bafk2bzacecdhw6x7dfrxfysmn6tdbn2ny464omgqppxhjuawxauscidppd7pc"),
 	},
-}, {
-	Network:      "caterpillarnet",
-	Version:      11,
-	BundleGitTag: "v11.0.0-rc2",
-	ManifestCid:  MustParseCid("bafy2bzacedeberqleewemblnbpwufbs6hnric73jy2anlb2sef4o72jf6mxsu"),
-	Actors: map[string]cid.Cid{
-		"account":          MustParseCid("bafk2bzacearzuvg6ugk4evuvgjkap2cyln2efrpano75ecgam4bzyl5l2enn6"),
-		"cron":             MustParseCid("bafk2bzaceas3ku3ol6pwlab7g7zgttfn5bhdo2qbc6vpkbgb2wbrzqsldsv6u"),
-		"datacap":          MustParseCid("bafk2bzacebyrneejblvplw6if36hhxx765hx7efnk7a4sj3lqsuupz6m7rgqm"),
-		"eam":              MustParseCid("bafk2bzaceaclwxphuqwymjozzomza3q2jhf6ib4mqewlrrgmkkqzupvpbaksk"),
-		"ethaccount":       MustParseCid("bafk2bzacebikzogkoy4fzkqrc3vdirr4h7eq3zzty7csc7aaabevocf65nfds"),
-		"evm":              MustParseCid("bafk2bzacectdxa4ctrobwmq5h42aqbras42b6hjea7krgkc3ghatuitgset4i"),
-		"init":             MustParseCid("bafk2bzacecdtsmhlxakdoyojcntubtj7kdplwq67dlodihs22zlz762ljkico"),
-		"multisig":         MustParseCid("bafk2bzacebgwns6gt4sv44ey7hz7nfqmk2z6g3yjrr32ovz5iuklrrc6xujn6"),
-		"paymentchannel":   MustParseCid("bafk2bzacedxwn53sstmkmakev6yjvwezfsozbeoljnk2ls2yfmndvytkcw3iq"),
-		"placeholder":      MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"),
-		"reward":           MustParseCid("bafk2bzacedjwx5vlghmudjd4zbgzjs7cgk5yyzn7hxb5usqyfwhhumhfse2wq"),
-		"storagemarket":    MustParseCid("bafk2bzacedxnxuwq64g5jsoz6dejx2lm6gjis5evzglaxdnb2rrb4oh2tvjhg"),
-		"storageminer":     MustParseCid("bafk2bzacedpmjackp3e3wucnu2kx4r6gl7cues2ogyfffvuv4x7ec5mwbwlie"),
-		"storagepower":     MustParseCid("bafk2bzacecjlefvghymezg6lrccaedviwirjg3vmu5sd5qz6aps3khjjvhlxm"),
-		"system":           MustParseCid("bafk2bzacec6p5l2no77yiaznaxogzg5zwgocfn32h7ebzry7vyxnbfqvn3oqa"),
-		"verifiedregistry": MustParseCid("bafk2bzacebmi44uxzpu3xhzlkjkczrjz2sv4brj3thxwc7c6nvhcjoc4divca"),
-	},
 }, {
 	Network: "devnet",
 	Version: 8,
@@ -307,10 +238,10 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 		"verifiedregistry": MustParseCid("bafk2bzacednorhcy446agy7ecpmfms2u4aoa3mj2eqomffuoerbik5yavrxyi"),
 	},
 }, {
-	Network: "devnet",
-	Version: 10,
-
-	ManifestCid: MustParseCid("bafy2bzacebzz376j5kizfck56366kdz5aut6ktqrvqbi3efa2d4l2o2m653ts"),
+	Network:      "devnet",
+	Version:      10,
+	BundleGitTag: "v10.0.0",
+	ManifestCid:  MustParseCid("bafy2bzacebzz376j5kizfck56366kdz5aut6ktqrvqbi3efa2d4l2o2m653ts"),
 	Actors: map[string]cid.Cid{
 		"account":          MustParseCid("bafk2bzacedkj5dqs5xxamnlug2d5dyjl6askf7wlmvwzhmsrzcvogv7acqfe6"),
 		"cron":             MustParseCid("bafk2bzaceabslrigld2vshng6sppbp3bsptjtttvbxctwqe5lkyl2efom2wu4"),
@@ -329,29 +260,6 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 		"system":           MustParseCid("bafk2bzaceairk5qz5hyzt4yyaxa356aszyifswiust5ilxizwxujcmtzvjzoa"),
 		"verifiedregistry": MustParseCid("bafk2bzaced2mkyqobpgna5jevosym3adv2bvraggigyz2jgn5cxymirxj4x3i"),
 	},
-}, {
-	Network:      "devnet",
-	Version:      11,
-	BundleGitTag: "v11.0.0-rc2",
-	ManifestCid:  MustParseCid("bafy2bzacec2nca2tmntojbsjmi6gpt7gnslv3phratoara3lpamv5w3do2qh2"),
-	Actors: map[string]cid.Cid{
-		"account":          MustParseCid("bafk2bzacedxucublg7o7zdy4vw4zr46vngpiflysif333saptv3tfzrh7ktcs"),
-		"cron":             MustParseCid("bafk2bzacebnihuzok7gxzmopayqmou42j3uwfpsdzpqkzxf4xvxbxco76cx42"),
-		"datacap":          MustParseCid("bafk2bzacebcz2agc2pojoqecllda5bytbtfns7uxozk6hexuzgktl3d447k3g"),
-		"eam":              MustParseCid("bafk2bzacedmy4fvb26m7rxom55tcjlekpprxieecgfqpxivum6cv72ca5ld3k"),
-		"ethaccount":       MustParseCid("bafk2bzacedlthlzuuaay4ouhvrdbcmljhudihgwtguxlqc5bqwem3hcymeiee"),
-		"evm":              MustParseCid("bafk2bzaceboozl4smxva6g6z6dqegtzszq2qheewgr3gbvd32bbvs64simorc"),
-		"init":             MustParseCid("bafk2bzacectfoykh2du5w2odxgtcu6jttdeup3j3sh6tke6zbgqzzmhqlc7vw"),
-		"multisig":         MustParseCid("bafk2bzaceawofhfckab5zwthkgyos5ornbrg7aeudhavgd6jglfb67tezjxpo"),
-		"paymentchannel":   MustParseCid("bafk2bzacebmw7foxdepc44p6wtwkoshvczi6lagspwivfy3o5zc6xcq7e2uzw"),
-		"placeholder":      MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"),
-		"reward":           MustParseCid("bafk2bzacebeclhjkqqstbnvhzsqf5b54257sblr673kuaqemz7mm4kapyepgw"),
-		"storagemarket":    MustParseCid("bafk2bzacea6jtlm65dcihroldmnfk6qxqrsjxxfw5hniftm4rnhuopm2gk6yg"),
-		"storageminer":     MustParseCid("bafk2bzacebpzfxjn2z2fk3ariehjldy6l5yker3o57etnup3thqmiqd4vbbdo"),
-		"storagepower":     MustParseCid("bafk2bzaceced2xdnoob5yb4tgyhdr2y2f5c5xo7k2ghe5kna5xuevapbvjwpw"),
-		"system":           MustParseCid("bafk2bzacea356un67ewdbot57dqreil7gqatzj6uy333xbgah5j6zpdwnpu2k"),
-		"verifiedregistry": MustParseCid("bafk2bzacea6jep5uswr6rfwuizfliy5bzbqahuednohmbgeo2lk443yugq2ho"),
-	},
 }, {
 	Network: "hyperspace",
 	Version: 8,
@@ -413,10 +321,10 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 		"verifiedregistry": MustParseCid("bafk2bzacecf3yodlyudzukumehbuabgqljyhjt5ifiv4vetcfohnvsxzynwga"),
 	},
 }, {
-	Network: "mainnet",
-	Version: 10,
-
-	ManifestCid: MustParseCid("bafy2bzacecsuyf7mmvrhkx2evng5gnz5canlnz2fdlzu2lvcgptiq2pzuovos"),
+	Network:      "mainnet",
+	Version:      10,
+	BundleGitTag: "v10.0.0",
+	ManifestCid:  MustParseCid("bafy2bzacecsuyf7mmvrhkx2evng5gnz5canlnz2fdlzu2lvcgptiq2pzuovos"),
 	Actors: map[string]cid.Cid{
 		"account":          MustParseCid("bafk2bzaceampw4romta75hyz5p4cqriypmpbgnkxncgxgqn6zptv5lsp2w2bo"),
 		"cron":             MustParseCid("bafk2bzacedcbtsifegiu432m5tysjzkxkmoczxscb6hqpmrr6img7xzdbbs2g"),
@@ -435,29 +343,6 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 		"system":           MustParseCid("bafk2bzacedakk5nofebyup4m7nvx6djksfwhnxzrfuq4oyemhpl4lllaikr64"),
 		"verifiedregistry": MustParseCid("bafk2bzacedfel6edzqpe5oujno7fog4i526go4dtcs6vwrdtbpy2xq6htvcg6"),
 	},
-}, {
-	Network:      "mainnet",
-	Version:      11,
-	BundleGitTag: "v11.0.0-rc2",
-	ManifestCid:  MustParseCid("bafy2bzacebgfsebvidddy6l6zplsgmibmuqiyfwxotnvoxknvnnhxerjnrgke"),
-	Actors: map[string]cid.Cid{
-		"account":          MustParseCid("bafk2bzacecrtbcv3sgamwajiigx4j6v3zd6ycdzicycfjheduxksntymovj72"),
-		"cron":             MustParseCid("bafk2bzacecdxzej5q7yodb6zkxjkfrmmuuemu2ykgh4qepnagis6j3gfo73zk"),
-		"datacap":          MustParseCid("bafk2bzacecsvwqyxiotzin33zkeqdmt63uokfww6ren6wqvynhow6kwl52oma"),
-		"eam":              MustParseCid("bafk2bzaceccgh7emq3a2f46l4buukmwchlggbdcdvxjt34snx64h7tq37vkya"),
-		"ethaccount":       MustParseCid("bafk2bzaceahuwxxcpnzzcxqkqa5247pvoojxq72koy36qlq223yyn7mhul7xk"),
-		"evm":              MustParseCid("bafk2bzaceafofne3osqnbupdosg23ixb4lsssnd6yo7rdj5gqvfwwxxnwxt22"),
-		"init":             MustParseCid("bafk2bzacedxf5bwugxllkuwpyg4ddleckryydoojbcirngbckmlxpdcrmtkw2"),
-		"multisig":         MustParseCid("bafk2bzaceakw5rdw67ok44cssjlr655th2kgzjjbcbadbymsl35feplyoljea"),
-		"paymentchannel":   MustParseCid("bafk2bzacecj5g34lvlq72wttc65dqdxebrmph4yjftygopsgo6ifabguuf5rm"),
-		"placeholder":      MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"),
-		"reward":           MustParseCid("bafk2bzacebnz62vsryganusdr4gwhhtm7vj5q5ev43tpcp4usgieh2xnk7dzk"),
-		"storagemarket":    MustParseCid("bafk2bzacecprtjtwkfbdzcqglg6bwbqzosamebta7darvistsareszgsxf6ig"),
-		"storageminer":     MustParseCid("bafk2bzacedomhrky77hoodiworfnh7imh66entqwsudm2hsmedfx2ymsprd6e"),
-		"storagepower":     MustParseCid("bafk2bzacecyri3krbroak66cpccmnjwjzjtzyv7a3qbqjscgnhb46yadtp36w"),
-		"system":           MustParseCid("bafk2bzacedehzsjoy5msxblwnkzi7hzuuohdzugh3j3bp427jcnef57xkqevc"),
-		"verifiedregistry": MustParseCid("bafk2bzaceazvpyoiqrsmitkjsaei3r6746d2fqoiy7yjo7htguvwo5ntlxfrq"),
-	},
 }, {
 	Network: "testing",
 	Version: 8,
@@ -496,10 +381,10 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 		"verifiedregistry": MustParseCid("bafk2bzaceatmqip2o3ausbntvdhj7yemu6hb3b5yqv6hm42gylbbmz7geocpm"),
 	},
 }, {
-	Network: "testing",
-	Version: 10,
-
-	ManifestCid: MustParseCid("bafy2bzacebsp3bkxwsijenqeimhvhtg52d6o76hn6qhzxveqfq7d5hdd5l2ee"),
+	Network:      "testing",
+	Version:      10,
+	BundleGitTag: "v10.0.0",
+	ManifestCid:  MustParseCid("bafy2bzacebsp3bkxwsijenqeimhvhtg52d6o76hn6qhzxveqfq7d5hdd5l2ee"),
 	Actors: map[string]cid.Cid{
 		"account":          MustParseCid("bafk2bzaceazxb6p2xg6caivmie6k2bvutyesngwyvhwv4eemwu7ia4vnqkcuy"),
 		"cron":             MustParseCid("bafk2bzaceax6ym73boyl5zdpbcr6zmbajzylmcdvlapz5zcqgzcshakz44jbq"),
@@ -518,29 +403,6 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 		"system":           MustParseCid("bafk2bzacecf2jimdz7knhngs64ximfz3eaud6s3kiunmkybgrkupdjyo2dw7o"),
 		"verifiedregistry": MustParseCid("bafk2bzacecdmek2htsgcyoyl35glakyab66cojqo2y335njnm7krleb6yfbps"),
 	},
-}, {
-	Network:      "testing",
-	Version:      11,
-	BundleGitTag: "v11.0.0-rc2",
-	ManifestCid:  MustParseCid("bafy2bzacedsxzhzzkfbexqyspkiwqyyn27xplscxtpria4babxsxqmvwvgzmg"),
-	Actors: map[string]cid.Cid{
-		"account":          MustParseCid("bafk2bzacecn3i4m2utctacfctwf3tord3a2z364yffacydc6h3mtv37exehxo"),
-		"cron":             MustParseCid("bafk2bzacedpt2d3ckjirv45esiug4hoousgqixdu3ya6yydhebjuklx6lkzuw"),
-		"datacap":          MustParseCid("bafk2bzacebfp7bklbkomcexam2r5aawv2ucuqzkdmeamch7bigsprmadfvxvk"),
-		"eam":              MustParseCid("bafk2bzaceds3dguvp5pvqnq7cwvz46mqbqem35nfril5frwumcauzdliamvam"),
-		"ethaccount":       MustParseCid("bafk2bzaceab3egffns45nwvvgtbncoq6jyqgyt4czvwrayz6x6isotbob55ve"),
-		"evm":              MustParseCid("bafk2bzacealplkpnbvap6qrz4vuiebkuutum3e5nasnscepfx5pw4grrvkfpe"),
-		"init":             MustParseCid("bafk2bzaced7mmznvvjh3vrlm3s3iostm7iwwvust3lcpujbldh4dmmrecoxia"),
-		"multisig":         MustParseCid("bafk2bzaceajadbzimbpdjzddi56p6hih5ro6p7pvwb635ivk6byktbjy2a3rq"),
-		"paymentchannel":   MustParseCid("bafk2bzacech2ns3zv7j3xxmbw37zldh5brg4j4shurf5scnf2q74ksow7f6tg"),
-		"placeholder":      MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"),
-		"reward":           MustParseCid("bafk2bzacearazt2oxjp5vbzymu2zfur2p5wj7giabxunj42w5embrmgi2byh2"),
-		"storagemarket":    MustParseCid("bafk2bzacecqtfzdcwygdjo7jyeonkfvhuyit6hv6an2bit6t6xdmliyiaxpyy"),
-		"storageminer":     MustParseCid("bafk2bzaceah46gbb5ls2dor2ajr7quofchee3bwghtq3btcjve3dpyrxo56tc"),
-		"storagepower":     MustParseCid("bafk2bzacedmz4i6cslncm65si47tnpmdbn5owvvm7kjisvbfvvkvdv2viucck"),
-		"system":           MustParseCid("bafk2bzaceably72ppjsvbtm2pmc7zzczvxsc7qaab5off6jy2qntwhax3klqa"),
-		"verifiedregistry": MustParseCid("bafk2bzacecozu2vc3tqk7az7koqdiejcgk2q476542pnv7tmx5beomtvtjbzc"),
-	},
 }, {
 	Network: "testing-fake-proofs",
 	Version: 8,
@@ -579,10 +441,10 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 		"verifiedregistry": MustParseCid("bafk2bzaceatmqip2o3ausbntvdhj7yemu6hb3b5yqv6hm42gylbbmz7geocpm"),
 	},
 }, {
-	Network: "testing-fake-proofs",
-	Version: 10,
-
-	ManifestCid: MustParseCid("bafy2bzacedwap2uuii4luljckrnb4vkur2unb6fyinn7xjie6xlva2wmlygj2"),
+	Network:      "testing-fake-proofs",
+	Version:      10,
+	BundleGitTag: "v10.0.0",
+	ManifestCid:  MustParseCid("bafy2bzacedwap2uuii4luljckrnb4vkur2unb6fyinn7xjie6xlva2wmlygj2"),
 	Actors: map[string]cid.Cid{
 		"account":          MustParseCid("bafk2bzaceazxb6p2xg6caivmie6k2bvutyesngwyvhwv4eemwu7ia4vnqkcuy"),
 		"cron":             MustParseCid("bafk2bzaceax6ym73boyl5zdpbcr6zmbajzylmcdvlapz5zcqgzcshakz44jbq"),
@@ -601,27 +463,4 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 		"system":           MustParseCid("bafk2bzacecf2jimdz7knhngs64ximfz3eaud6s3kiunmkybgrkupdjyo2dw7o"),
 		"verifiedregistry": MustParseCid("bafk2bzacecdmek2htsgcyoyl35glakyab66cojqo2y335njnm7krleb6yfbps"),
 	},
-}, {
-	Network:      "testing-fake-proofs",
-	Version:      11,
-	BundleGitTag: "v11.0.0-rc2",
-	ManifestCid:  MustParseCid("bafy2bzacebebmxp3bmls3erhyyothy243ljtet4wtey54ufbygat3nhs6rody"),
-	Actors: map[string]cid.Cid{
-		"account":          MustParseCid("bafk2bzacecn3i4m2utctacfctwf3tord3a2z364yffacydc6h3mtv37exehxo"),
-		"cron":             MustParseCid("bafk2bzacedpt2d3ckjirv45esiug4hoousgqixdu3ya6yydhebjuklx6lkzuw"),
-		"datacap":          MustParseCid("bafk2bzacebfp7bklbkomcexam2r5aawv2ucuqzkdmeamch7bigsprmadfvxvk"),
-		"eam":              MustParseCid("bafk2bzaceds3dguvp5pvqnq7cwvz46mqbqem35nfril5frwumcauzdliamvam"),
-		"ethaccount":       MustParseCid("bafk2bzaceab3egffns45nwvvgtbncoq6jyqgyt4czvwrayz6x6isotbob55ve"),
-		"evm":              MustParseCid("bafk2bzacealplkpnbvap6qrz4vuiebkuutum3e5nasnscepfx5pw4grrvkfpe"),
-		"init":             MustParseCid("bafk2bzaced7mmznvvjh3vrlm3s3iostm7iwwvust3lcpujbldh4dmmrecoxia"),
-		"multisig":         MustParseCid("bafk2bzaceajadbzimbpdjzddi56p6hih5ro6p7pvwb635ivk6byktbjy2a3rq"),
-		"paymentchannel":   MustParseCid("bafk2bzacech2ns3zv7j3xxmbw37zldh5brg4j4shurf5scnf2q74ksow7f6tg"),
-		"placeholder":      MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"),
-		"reward":           MustParseCid("bafk2bzacearazt2oxjp5vbzymu2zfur2p5wj7giabxunj42w5embrmgi2byh2"),
-		"storagemarket":    MustParseCid("bafk2bzacecqtfzdcwygdjo7jyeonkfvhuyit6hv6an2bit6t6xdmliyiaxpyy"),
-		"storageminer":     MustParseCid("bafk2bzacec6ntijn67h3gnn5htgbnlpwfp7g47t4nlkr3llr6trnaj35p3kas"),
-		"storagepower":     MustParseCid("bafk2bzaceasdxhi4r4ksy6ageji3xhajr5m5rgixk2w6ojp456kbacmjvxqai"),
-		"system":           MustParseCid("bafk2bzaceably72ppjsvbtm2pmc7zzczvxsc7qaab5off6jy2qntwhax3klqa"),
-		"verifiedregistry": MustParseCid("bafk2bzacecozu2vc3tqk7az7koqdiejcgk2q476542pnv7tmx5beomtvtjbzc"),
-	},
 }}
@@ -69,6 +69,10 @@ var DrandConfigs = map[DrandEnum]dtypes.DrandConfig{
 		ChainInfoJSON: `{"public_key":"8cda589f88914aa728fd183f383980b35789ce81b274e5daee1f338b77d02566ef4d3fb0098af1f844f10f9c803c1827","period":25,"genesis_time":1595348225,"hash":"e73b7dc3c4f6a236378220c0dd6aa110eb16eed26c11259606e07ee122838d4f","groupHash":"567d4785122a5a3e75a9bc9911d7ea807dd85ff76b78dc4ff06b075712898607"}`,
 	},
 	DrandIncentinet: {
+		Servers: []string{
+			"https://dev1.drand.sh",
+			"https://dev2.drand.sh",
+		},
 		ChainInfoJSON: `{"public_key":"8cad0c72c606ab27d36ee06de1d5b2db1faf92e447025ca37575ab3a8aac2eaae83192f846fc9e158bc738423753d000","period":30,"genesis_time":1595873820,"hash":"80c8b872c714f4c00fdd3daa465d5514049f457f01f85a4caf68cdcd394ba039","groupHash":"d9406aaed487f7af71851b4399448e311f2328923d454e971536c05398ce2d9b"}`,
 	},
 }
@@ -23,7 +23,7 @@ var NetworkBundle = "devnet"
 var BundleOverrides map[actorstypes.Version]string
 var ActorDebugging = true

-const GenesisNetworkVersion = network.Version18
+const GenesisNetworkVersion = network.Version17

 var UpgradeBreezeHeight = abi.ChainEpoch(-1)

@@ -59,11 +59,7 @@ var UpgradeSkyrHeight = abi.ChainEpoch(-19)

 var UpgradeSharkHeight = abi.ChainEpoch(-20)

-var UpgradeHyggeHeight = abi.ChainEpoch(-21)
-
-var UpgradeLightningHeight = abi.ChainEpoch(30)
-
-var UpgradeThunderHeight = abi.ChainEpoch(1000)
+var UpgradeHyggeHeight = abi.ChainEpoch(30)

 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,
@@ -118,8 +114,6 @@ func init() {
 	UpgradeSkyrHeight = getUpgradeHeight("LOTUS_SKYR_HEIGHT", UpgradeSkyrHeight)
 	UpgradeSharkHeight = getUpgradeHeight("LOTUS_SHARK_HEIGHT", UpgradeSharkHeight)
 	UpgradeHyggeHeight = getUpgradeHeight("LOTUS_HYGGE_HEIGHT", UpgradeHyggeHeight)
-	UpgradeLightningHeight = getUpgradeHeight("LOTUS_LIGHTNING_HEIGHT", UpgradeLightningHeight)
-	UpgradeThunderHeight = getUpgradeHeight("LOTUS_THUNDER_HEIGHT", UpgradeThunderHeight)

 	BuildType |= Build2k

@@ -19,7 +19,7 @@ var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,
 }

-const GenesisNetworkVersion = network.Version18
+const GenesisNetworkVersion = network.Version17

 var NetworkBundle = "butterflynet"
 var BundleOverrides map[actorstypes.Version]string
@@ -50,12 +50,8 @@ const UpgradeHyperdriveHeight = -16
 const UpgradeChocolateHeight = -17
 const UpgradeOhSnapHeight = -18
 const UpgradeSkyrHeight = -19
-const UpgradeSharkHeight = -20
-const UpgradeHyggeHeight = -21
-
-const UpgradeLightningHeight = 50
-
-const UpgradeThunderHeight = UpgradeLightningHeight + 360
+const UpgradeSharkHeight = abi.ChainEpoch(-20)
+const UpgradeHyggeHeight = abi.ChainEpoch(600)

 var SupportedProofTypes = []abi.RegisteredSealProof{
 	abi.RegisteredSealProof_StackedDrg512MiBV1,
@@ -73,12 +73,6 @@ const UpgradeSharkHeight = 16800 // 6 days after genesis
 // 2023-02-21T16:30:00Z
 const UpgradeHyggeHeight = 322354

-// 2023-04-20T14:00:00Z
-const UpgradeLightningHeight = 489094
-
-// 2023-04-21T16:00:00Z
-const UpgradeThunderHeight = UpgradeLightningHeight + 3120
-
 var SupportedProofTypes = []abi.RegisteredSealProof{
 	abi.RegisteredSealProof_StackedDrg32GiBV1,
 	abi.RegisteredSealProof_StackedDrg64GiBV1,
@@ -52,13 +52,7 @@ var UpgradeSkyrHeight = abi.ChainEpoch(-19)

 const UpgradeSharkHeight = abi.ChainEpoch(-20)

-const UpgradeHyggeHeight = abi.ChainEpoch(100)
-
-// ??????????
-const UpgradeLightningHeight = 200
-
-// ??????????????????
-const UpgradeThunderHeight = 300
+const UpgradeHyggeHeight = abi.ChainEpoch(99999999999999)

 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,
@@ -87,13 +87,7 @@ const UpgradeSkyrHeight = 1960320
 const UpgradeSharkHeight = 2383680

 // 2023-03-14T15:14:00Z
-const UpgradeHyggeHeight = 2683348
-
-// ??????????
-var UpgradeLightningHeight = abi.ChainEpoch(9999999999)
-
-// ??????????
-var UpgradeThunderHeight = UpgradeLightningHeight + 1
+var UpgradeHyggeHeight = abi.ChainEpoch(2683348)

 var SupportedProofTypes = []abi.RegisteredSealProof{
 	abi.RegisteredSealProof_StackedDrg32GiBV1,
@@ -108,12 +102,8 @@ func init() {
 		SetAddressNetwork(address.Mainnet)
 	}

-	if os.Getenv("LOTUS_DISABLE_LIGHTNING") == "1" {
-		UpgradeLightningHeight = math.MaxInt64
-	}
-
-	if os.Getenv("LOTUS_DISABLE_THUNDER") == "1" {
-		UpgradeThunderHeight = math.MaxInt64
+	if os.Getenv("LOTUS_DISABLE_HYGGE") == "1" {
+		UpgradeHyggeHeight = math.MaxInt64
 	}

 	// NOTE: DO NOT change this unless you REALLY know what you're doing. This is not consensus critical, however,
@@ -26,17 +26,16 @@ const UnixfsLinksPerLevel = 1024

 const AllowableClockDriftSecs = uint64(1)

-// TODO: nv19: Re-enable when migration is setup
-//// Used by tests and some obscure tooling
-///* inline-gen template
-//
-//const TestNetworkVersion = network.Version{{.latestNetworkVersion}}
-//
-///* inline-gen start */
+// Used by tests and some obscure tooling
+/* inline-gen template
+
+const TestNetworkVersion = network.Version{{.latestNetworkVersion}}
+
+/* inline-gen start */

 const TestNetworkVersion = network.Version18

-///* inline-gen end */
+/* inline-gen end */

 // Epochs
 const ForkLengthThreshold = Finality
@@ -106,8 +106,6 @@ var (
 	UpgradeSkyrHeight       abi.ChainEpoch = -18
 	UpgradeSharkHeight      abi.ChainEpoch = -19
 	UpgradeHyggeHeight      abi.ChainEpoch = -20
-	UpgradeLightningHeight  abi.ChainEpoch = -21
-	UpgradeThunderHeight    abi.ChainEpoch = -22

 	DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 		0: DrandMainnet,
@@ -37,7 +37,7 @@ func BuildTypeString() string {
 }

 // BuildVersion is the local build version
-const BuildVersion = "1.22.0-rc4"
+const BuildVersion = "1.20.3"

 func UserVersion() string {
 	if os.Getenv("LOTUS_VERSION_IGNORE_COMMIT") == "1" {
@@ -6,7 +6,7 @@ import (

 	"github.com/filecoin-project/go-address"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtin11 "github.com/filecoin-project/go-state-types/builtin"
+	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"
@@ -22,7 +22,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/types"
 )

-var Methods = builtin11.MethodsAccount
+var Methods = builtin10.MethodsAccount

 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
@@ -41,9 +41,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version10:
 			return load10(store, act.Head)

-		case actorstypes.Version11:
-			return load11(store, act.Head)
-
 		}
 	}

@@ -108,9 +105,6 @@ func MakeState(store adt.Store, av actorstypes.Version, addr address.Address) (S
 	case actorstypes.Version10:
 		return make10(store, addr)

-	case actorstypes.Version11:
-		return make11(store, addr)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -138,6 +132,5 @@ func AllCodes() []cid.Cid {
 		(&state8{}).Code(),
 		(&state9{}).Code(),
 		(&state10{}).Code(),
-		(&state11{}).Code(),
 	}
 }
@@ -1,62 +0,0 @@
-package account
-
-import (
-	"fmt"
-
-	"github.com/ipfs/go-cid"
-
-	"github.com/filecoin-project/go-address"
-	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	account11 "github.com/filecoin-project/go-state-types/builtin/v11/account"
-	"github.com/filecoin-project/go-state-types/manifest"
-
-	"github.com/filecoin-project/lotus/chain/actors"
-	"github.com/filecoin-project/lotus/chain/actors/adt"
-)
-
-var _ State = (*state11)(nil)
-
-func load11(store adt.Store, root cid.Cid) (State, error) {
-	out := state11{store: store}
-	err := store.Get(store.Context(), root, &out)
-	if err != nil {
-		return nil, err
-	}
-	return &out, nil
-}
-
-func make11(store adt.Store, addr address.Address) (State, error) {
-	out := state11{store: store}
-	out.State = account11.State{Address: addr}
-	return &out, nil
-}
-
-type state11 struct {
-	account11.State
-	store adt.Store
-}
-
-func (s *state11) PubkeyAddress() (address.Address, error) {
-	return s.Address, nil
-}
-
-func (s *state11) GetState() interface{} {
-	return &s.State
-}
-
-func (s *state11) ActorKey() string {
-	return manifest.AccountKey
-}
-
-func (s *state11) ActorVersion() actorstypes.Version {
-	return actorstypes.Version11
-}
-
-func (s *state11) Code() cid.Cid {
-	code, ok := actors.GetActorCodeID(s.ActorVersion(), s.ActorKey())
-	if !ok {
-		panic(fmt.Errorf("didn't find actor %v code id for actor version %d", s.ActorKey(), s.ActorVersion()))
-	}
-
-	return code
-}
@@ -5,7 +5,7 @@ import (
 	"golang.org/x/xerrors"

 	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtin11 "github.com/filecoin-project/go-state-types/builtin"
+	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"
@@ -37,9 +37,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version10:
 			return load10(store, act.Head)

-		case actorstypes.Version11:
-			return load11(store, act.Head)
-
 		}
 	}

@@ -104,16 +101,13 @@ func MakeState(store adt.Store, av actorstypes.Version) (State, error) {
 	case actorstypes.Version10:
 		return make10(store)

-	case actorstypes.Version11:
-		return make11(store)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }

 var (
-	Address = builtin11.CronActorAddr
-	Methods = builtin11.MethodsCron
+	Address = builtin10.CronActorAddr
+	Methods = builtin10.MethodsCron
 )

 type State interface {
@@ -136,6 +130,5 @@ func AllCodes() []cid.Cid {
 		(&state8{}).Code(),
 		(&state9{}).Code(),
 		(&state10{}).Code(),
-		(&state11{}).Code(),
 	}
 }
@@ -1,57 +0,0 @@
-package cron
-
-import (
-	"fmt"
-
-	"github.com/ipfs/go-cid"
-
-	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	cron11 "github.com/filecoin-project/go-state-types/builtin/v11/cron"
-	"github.com/filecoin-project/go-state-types/manifest"
-
-	"github.com/filecoin-project/lotus/chain/actors"
-	"github.com/filecoin-project/lotus/chain/actors/adt"
-)
-
-var _ State = (*state11)(nil)
-
-func load11(store adt.Store, root cid.Cid) (State, error) {
-	out := state11{store: store}
-	err := store.Get(store.Context(), root, &out)
-	if err != nil {
-		return nil, err
-	}
-	return &out, nil
-}
-
-func make11(store adt.Store) (State, error) {
-	out := state11{store: store}
-	out.State = *cron11.ConstructState(cron11.BuiltInEntries())
-	return &out, nil
-}
-
-type state11 struct {
-	cron11.State
-	store adt.Store
-}
-
-func (s *state11) GetState() interface{} {
-	return &s.State
-}
-
-func (s *state11) ActorKey() string {
-	return manifest.CronKey
-}
-
-func (s *state11) ActorVersion() actorstypes.Version {
-	return actorstypes.Version11
-}
-
-func (s *state11) Code() cid.Cid {
-	code, ok := actors.GetActorCodeID(s.ActorVersion(), s.ActorKey())
-	if !ok {
-		panic(fmt.Errorf("didn't find actor %v code id for actor version %d", s.ActorKey(), s.ActorVersion()))
-	}
-
-	return code
-}
@@ -7,7 +7,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"
-	builtin11 "github.com/filecoin-project/go-state-types/builtin"
+	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"

@@ -17,8 +17,8 @@ import (
 )

 var (
-	Address = builtin11.DatacapActorAddr
-	Methods = builtin11.MethodsDatacap
+	Address = builtin10.DatacapActorAddr
+	Methods = builtin10.MethodsDatacap
 )

 func Load(store adt.Store, act *types.Actor) (State, error) {
@@ -35,9 +35,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version10:
 			return load10(store, act.Head)

-		case actorstypes.Version11:
-			return load11(store, act.Head)
-
 		}
 	}

@@ -53,9 +50,6 @@ func MakeState(store adt.Store, av actorstypes.Version, governor address.Address
 	case actorstypes.Version10:
 		return make10(store, governor, bitwidth)

-	case actorstypes.Version11:
-		return make11(store, governor, bitwidth)
-
 	default:
 		return nil, xerrors.Errorf("datacap actor only valid for actors v9 and above, got %d", av)
 	}
@@ -78,6 +72,5 @@ func AllCodes() []cid.Cid {
 	return []cid.Cid{
 		(&state9{}).Code(),
 		(&state10{}).Code(),
-		(&state11{}).Code(),
 	}
 }
@@ -1,82 +0,0 @@
-package datacap
-
-import (
-	"fmt"
-
-	"github.com/ipfs/go-cid"
-
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	datacap11 "github.com/filecoin-project/go-state-types/builtin/v11/datacap"
-	adt11 "github.com/filecoin-project/go-state-types/builtin/v11/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"
-)
-
-var _ State = (*state11)(nil)
-
-func load11(store adt.Store, root cid.Cid) (State, error) {
-	out := state11{store: store}
-	err := store.Get(store.Context(), root, &out)
-	if err != nil {
-		return nil, err
-	}
-	return &out, nil
-}
-
-func make11(store adt.Store, governor address.Address, bitwidth uint64) (State, error) {
-	out := state11{store: store}
-	s, err := datacap11.ConstructState(store, governor, bitwidth)
-	if err != nil {
-		return nil, err
-	}
-
-	out.State = *s
-
-	return &out, nil
-}
-
-type state11 struct {
-	datacap11.State
-	store adt.Store
-}
-
-func (s *state11) Governor() (address.Address, error) {
-	return s.State.Governor, nil
-}
-
-func (s *state11) GetState() interface{} {
-	return &s.State
-}
-
-func (s *state11) ForEachClient(cb func(addr address.Address, dcap abi.StoragePower) error) error {
-	return forEachClient(s.store, actors.Version11, s.verifiedClients, cb)
-}
-
-func (s *state11) verifiedClients() (adt.Map, error) {
-	return adt11.AsMap(s.store, s.Token.Balances, int(s.Token.HamtBitWidth))
-}
-
-func (s *state11) VerifiedClientDataCap(addr address.Address) (bool, abi.StoragePower, error) {
-	return getDataCap(s.store, actors.Version11, s.verifiedClients, addr)
-}
-
-func (s *state11) ActorKey() string {
-	return manifest.DatacapKey
-}
-
-func (s *state11) ActorVersion() actorstypes.Version {
-	return actorstypes.Version11
-}
-
-func (s *state11) Code() cid.Cid {
-	code, ok := actors.GetActorCodeID(s.ActorVersion(), s.ActorKey())
-	if !ok {
-		panic(fmt.Errorf("didn't find actor %v code id for actor version %d", s.ActorKey(), s.ActorVersion()))
-	}
-
-	return code
-}
@@ -5,7 +5,7 @@ import (
 	"golang.org/x/xerrors"

 	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtin11 "github.com/filecoin-project/go-state-types/builtin"
+	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"

@@ -14,7 +14,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/types"
 )

-var Methods = builtin11.MethodsEVM
+var Methods = builtin10.MethodsEVM

 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
@@ -27,9 +27,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version10:
 			return load10(store, act.Head)

-		case actorstypes.Version11:
-			return load11(store, act.Head)
-
 		}
 	}

@@ -42,9 +39,6 @@ func MakeState(store adt.Store, av actorstypes.Version, bytecode cid.Cid) (State
 	case actorstypes.Version10:
 		return make10(store, bytecode)

-	case actorstypes.Version11:
-		return make11(store, bytecode)
-
 	default:
 		return nil, xerrors.Errorf("evm actor only valid for actors v10 and above, got %d", av)
 	}
@@ -1,72 +0,0 @@
-package evm
-
-import (
-	"github.com/ipfs/go-cid"
-
-	"github.com/filecoin-project/go-state-types/abi"
-	evm11 "github.com/filecoin-project/go-state-types/builtin/v11/evm"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
-)
-
-var _ State = (*state11)(nil)
-
-func load11(store adt.Store, root cid.Cid) (State, error) {
-	out := state11{store: store}
-	err := store.Get(store.Context(), root, &out)
-	if err != nil {
-		return nil, err
-	}
-	return &out, nil
-}
-
-func make11(store adt.Store, bytecode cid.Cid) (State, error) {
-	out := state11{store: store}
-	s, err := evm11.ConstructState(store, bytecode)
-	if err != nil {
-		return nil, err
-	}
-
-	out.State = *s
-
-	return &out, nil
-}
-
-type state11 struct {
-	evm11.State
-	store adt.Store
-}
-
-func (s *state11) Nonce() (uint64, error) {
-	return s.State.Nonce, nil
-}
-
-func (s *state11) IsAlive() (bool, error) {
-	return s.State.Tombstone == nil, nil
-}
-
-func (s *state11) GetState() interface{} {
-	return &s.State
-}
-
-func (s *state11) GetBytecodeCID() (cid.Cid, error) {
-	return s.State.Bytecode, nil
-}
-
-func (s *state11) GetBytecodeHash() ([32]byte, error) {
-	return s.State.BytecodeHash, nil
-}
-
-func (s *state11) GetBytecode() ([]byte, error) {
-	bc, err := s.GetBytecodeCID()
-	if err != nil {
-		return nil, err
-	}
-
-	var byteCode abi.CborBytesTransparent
-	if err := s.store.Get(s.store.Context(), bc, &byteCode); err != nil {
-		return nil, err
-	}
-
-	return byteCode, nil
-}
@@ -7,7 +7,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"
-	builtin11 "github.com/filecoin-project/go-state-types/builtin"
+	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"
@@ -25,8 +25,8 @@ import (
 )

 var (
-	Address = builtin11.InitActorAddr
-	Methods = builtin11.MethodsInit
+	Address = builtin10.InitActorAddr
+	Methods = builtin10.MethodsInit
 )

 func Load(store adt.Store, act *types.Actor) (State, error) {
@@ -46,9 +46,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version10:
 			return load10(store, act.Head)

-		case actorstypes.Version11:
-			return load11(store, act.Head)
-
 		}
 	}

@@ -113,9 +110,6 @@ func MakeState(store adt.Store, av actorstypes.Version, networkName string) (Sta
 	case actorstypes.Version10:
 		return make10(store, networkName)

-	case actorstypes.Version11:
-		return make11(store, networkName)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -166,6 +160,5 @@ func AllCodes() []cid.Cid {
 		(&state8{}).Code(),
 		(&state9{}).Code(),
 		(&state10{}).Code(),
-		(&state11{}).Code(),
 	}
 }
@@ -1,147 +0,0 @@
-package init
-
-import (
-	"crypto/sha256"
-	"fmt"
-
-	"github.com/ipfs/go-cid"
-	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
-
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtin11 "github.com/filecoin-project/go-state-types/builtin"
-	init11 "github.com/filecoin-project/go-state-types/builtin/v11/init"
-	adt11 "github.com/filecoin-project/go-state-types/builtin/v11/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"
-	"github.com/filecoin-project/lotus/node/modules/dtypes"
-)
-
-var _ State = (*state11)(nil)
-
-func load11(store adt.Store, root cid.Cid) (State, error) {
-	out := state11{store: store}
-	err := store.Get(store.Context(), root, &out)
-	if err != nil {
-		return nil, err
-	}
-	return &out, nil
-}
-
-func make11(store adt.Store, networkName string) (State, error) {
-	out := state11{store: store}
-
-	s, err := init11.ConstructState(store, networkName)
-	if err != nil {
-		return nil, err
-	}
-
-	out.State = *s
-
-	return &out, nil
-}
-
-type state11 struct {
-	init11.State
-	store adt.Store
-}
-
-func (s *state11) ResolveAddress(address address.Address) (address.Address, bool, error) {
-	return s.State.ResolveAddress(s.store, address)
-}
-
-func (s *state11) MapAddressToNewID(address address.Address) (address.Address, error) {
-	return s.State.MapAddressToNewID(s.store, address)
-}
-
-func (s *state11) ForEachActor(cb func(id abi.ActorID, address address.Address) error) error {
-	addrs, err := adt11.AsMap(s.store, s.State.AddressMap, builtin11.DefaultHamtBitwidth)
-	if err != nil {
-		return err
-	}
-	var actorID cbg.CborInt
-	return addrs.ForEach(&actorID, func(key string) error {
-		addr, err := address.NewFromBytes([]byte(key))
-		if err != nil {
-			return err
-		}
-		return cb(abi.ActorID(actorID), addr)
-	})
-}
-
-func (s *state11) NetworkName() (dtypes.NetworkName, error) {
-	return dtypes.NetworkName(s.State.NetworkName), nil
-}
-
-func (s *state11) SetNetworkName(name string) error {
-	s.State.NetworkName = name
-	return nil
-}
-
-func (s *state11) SetNextID(id abi.ActorID) error {
-	s.State.NextID = id
-	return nil
-}
-
-func (s *state11) Remove(addrs ...address.Address) (err error) {
-	m, err := adt11.AsMap(s.store, s.State.AddressMap, builtin11.DefaultHamtBitwidth)
-	if err != nil {
-		return err
-	}
-	for _, addr := range addrs {
-		if err = m.Delete(abi.AddrKey(addr)); err != nil {
-			return xerrors.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
-		}
-	}
-	amr, err := m.Root()
-	if err != nil {
-		return xerrors.Errorf("failed to get address map root: %w", err)
-	}
-	s.State.AddressMap = amr
-	return nil
-}
-
-func (s *state11) SetAddressMap(mcid cid.Cid) error {
-	s.State.AddressMap = mcid
-	return nil
-}
-
-func (s *state11) GetState() interface{} {
-	return &s.State
-}
-
-func (s *state11) AddressMap() (adt.Map, error) {
-	return adt11.AsMap(s.store, s.State.AddressMap, builtin11.DefaultHamtBitwidth)
-}
-
-func (s *state11) AddressMapBitWidth() int {
-	return builtin11.DefaultHamtBitwidth
-}
-
-func (s *state11) AddressMapHashFunction() func(input []byte) []byte {
-	return func(input []byte) []byte {
-		res := sha256.Sum256(input)
-		return res[:]
-	}
-}
-
-func (s *state11) ActorKey() string {
-	return manifest.InitKey
-}
-
-func (s *state11) ActorVersion() actorstypes.Version {
-	return actorstypes.Version11
-}
-
-func (s *state11) Code() cid.Cid {
-	code, ok := actors.GetActorCodeID(s.ActorVersion(), s.ActorKey())
-	if !ok {
-		panic(fmt.Errorf("didn't find actor %v code id for actor version %d", s.ActorKey(), s.ActorVersion()))
-	}
-
-	return code
-}
@@ -52,9 +52,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version10:
 			return load10(store, act.Head)

-		case actorstypes.Version11:
-			return load11(store, act.Head)
-
 		}
 	}

@@ -119,9 +116,6 @@ func MakeState(store adt.Store, av actorstypes.Version) (State, error) {
 	case actorstypes.Version10:
 		return make10(store)

-	case actorstypes.Version11:
-		return make11(store)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -214,9 +208,6 @@ func DecodePublishStorageDealsReturn(b []byte, nv network.Version) (PublishStora
 	case actorstypes.Version10:
 		return decodePublishStorageDealsReturn10(b)

-	case actorstypes.Version11:
-		return decodePublishStorageDealsReturn11(b)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -302,6 +293,5 @@ func AllCodes() []cid.Cid {
 		(&state8{}).Code(),
 		(&state9{}).Code(),
 		(&state10{}).Code(),
-		(&state11{}).Code(),
 	}
 }
@@ -1,377 +0,0 @@
-package market
-
-import (
-	"bytes"
-	"fmt"
-
-	"github.com/ipfs/go-cid"
-	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
-
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-bitfield"
-	rlepluslazy "github.com/filecoin-project/go-bitfield/rle"
-	"github.com/filecoin-project/go-state-types/abi"
-	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	"github.com/filecoin-project/go-state-types/builtin"
-	market11 "github.com/filecoin-project/go-state-types/builtin/v11/market"
-	adt11 "github.com/filecoin-project/go-state-types/builtin/v11/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"
-	"github.com/filecoin-project/lotus/chain/types"
-)
-
-var _ State = (*state11)(nil)
-
-func load11(store adt.Store, root cid.Cid) (State, error) {
-	out := state11{store: store}
-	err := store.Get(store.Context(), root, &out)
-	if err != nil {
-		return nil, err
-	}
-	return &out, nil
-}
-
-func make11(store adt.Store) (State, error) {
-	out := state11{store: store}
-
-	s, err := market11.ConstructState(store)
-	if err != nil {
-		return nil, err
-	}
-
-	out.State = *s
-
-	return &out, nil
-}
-
-type state11 struct {
-	market11.State
-	store adt.Store
-}
-
-func (s *state11) TotalLocked() (abi.TokenAmount, error) {
-	fml := types.BigAdd(s.TotalClientLockedCollateral, s.TotalProviderLockedCollateral)
-	fml = types.BigAdd(fml, s.TotalClientStorageFee)
-	return fml, nil
-}
-
-func (s *state11) BalancesChanged(otherState State) (bool, error) {
-	otherState11, ok := otherState.(*state11)
-	if !ok {
-		// there's no way to compare different versions of the state, so let's
-		// just say that means the state of balances has changed
-		return true, nil
-	}
-	return !s.State.EscrowTable.Equals(otherState11.State.EscrowTable) || !s.State.LockedTable.Equals(otherState11.State.LockedTable), nil
-}
-
-func (s *state11) StatesChanged(otherState State) (bool, error) {
-	otherState11, ok := otherState.(*state11)
-	if !ok {
-		// there's no way to compare different versions of the state, so let's
-		// just say that means the state of balances has changed
-		return true, nil
-	}
-	return !s.State.States.Equals(otherState11.State.States), nil
-}
-
-func (s *state11) States() (DealStates, error) {
-	stateArray, err := adt11.AsArray(s.store, s.State.States, market11.StatesAmtBitwidth)
-	if err != nil {
-		return nil, err
-	}
-	return &dealStates11{stateArray}, nil
-}
-
-func (s *state11) ProposalsChanged(otherState State) (bool, error) {
-	otherState11, ok := otherState.(*state11)
-	if !ok {
-		// there's no way to compare different versions of the state, so let's
-		// just say that means the state of balances has changed
-		return true, nil
-	}
-	return !s.State.Proposals.Equals(otherState11.State.Proposals), nil
-}
-
-func (s *state11) Proposals() (DealProposals, error) {
-	proposalArray, err := adt11.AsArray(s.store, s.State.Proposals, market11.ProposalsAmtBitwidth)
-	if err != nil {
-		return nil, err
-	}
-	return &dealProposals11{proposalArray}, nil
-}
-
-func (s *state11) EscrowTable() (BalanceTable, error) {
-	bt, err := adt11.AsBalanceTable(s.store, s.State.EscrowTable)
-	if err != nil {
-		return nil, err
-	}
-	return &balanceTable11{bt}, nil
-}
-
-func (s *state11) LockedTable() (BalanceTable, error) {
-	bt, err := adt11.AsBalanceTable(s.store, s.State.LockedTable)
-	if err != nil {
-		return nil, err
-	}
-	return &balanceTable11{bt}, nil
-}
-
-func (s *state11) VerifyDealsForActivation(
-	minerAddr address.Address, deals []abi.DealID, currEpoch, sectorExpiry abi.ChainEpoch,
-) (weight, verifiedWeight abi.DealWeight, err error) {
-	w, vw, _, err := market11.ValidateDealsForActivation(&s.State, s.store, deals, minerAddr, sectorExpiry, currEpoch)
-	return w, vw, err
-}
-
-func (s *state11) NextID() (abi.DealID, error) {
-	return s.State.NextID, nil
-}
-
-type balanceTable11 struct {
-	*adt11.BalanceTable
-}
-
-func (bt *balanceTable11) ForEach(cb func(address.Address, abi.TokenAmount) error) error {
-	asMap := (*adt11.Map)(bt.BalanceTable)
-	var ta abi.TokenAmount
-	return asMap.ForEach(&ta, func(key string) error {
-		a, err := address.NewFromBytes([]byte(key))
-		if err != nil {
-			return err
-		}
-		return cb(a, ta)
-	})
-}
-
-type dealStates11 struct {
-	adt.Array
-}
-
-func (s *dealStates11) Get(dealID abi.DealID) (*DealState, bool, error) {
-	var deal11 market11.DealState
-	found, err := s.Array.Get(uint64(dealID), &deal11)
-	if err != nil {
-		return nil, false, err
-	}
-	if !found {
-		return nil, false, nil
-	}
-	deal := fromV11DealState(deal11)
-	return &deal, true, nil
-}
-
-func (s *dealStates11) ForEach(cb func(dealID abi.DealID, ds DealState) error) error {
-	var ds11 market11.DealState
-	return s.Array.ForEach(&ds11, func(idx int64) error {
-		return cb(abi.DealID(idx), fromV11DealState(ds11))
-	})
-}
-
-func (s *dealStates11) decode(val *cbg.Deferred) (*DealState, error) {
-	var ds11 market11.DealState
-	if err := ds11.UnmarshalCBOR(bytes.NewReader(val.Raw)); err != nil {
-		return nil, err
-	}
-	ds := fromV11DealState(ds11)
-	return &ds, nil
-}
-
-func (s *dealStates11) array() adt.Array {
-	return s.Array
-}
-
-func fromV11DealState(v11 market11.DealState) DealState {
-	ret := DealState{
-		SectorStartEpoch: v11.SectorStartEpoch,
-		LastUpdatedEpoch: v11.LastUpdatedEpoch,
-		SlashEpoch:       v11.SlashEpoch,
-		VerifiedClaim:    0,
-	}
-
-	ret.VerifiedClaim = verifregtypes.AllocationId(v11.VerifiedClaim)
-
-	return ret
-}
-
-type dealProposals11 struct {
-	adt.Array
-}
-
-func (s *dealProposals11) Get(dealID abi.DealID) (*DealProposal, bool, error) {
-	var proposal11 market11.DealProposal
-	found, err := s.Array.Get(uint64(dealID), &proposal11)
-	if err != nil {
-		return nil, false, err
-	}
-	if !found {
-		return nil, false, nil
-	}
-
-	proposal, err := fromV11DealProposal(proposal11)
-	if err != nil {
-		return nil, true, xerrors.Errorf("decoding proposal: %w", err)
-	}
-
-	return &proposal, true, nil
-}
-
-func (s *dealProposals11) ForEach(cb func(dealID abi.DealID, dp DealProposal) error) error {
-	var dp11 market11.DealProposal
-	return s.Array.ForEach(&dp11, func(idx int64) error {
-		dp, err := fromV11DealProposal(dp11)
-		if err != nil {
-			return xerrors.Errorf("decoding proposal: %w", err)
-		}
-
-		return cb(abi.DealID(idx), dp)
-	})
-}
-
-func (s *dealProposals11) decode(val *cbg.Deferred) (*DealProposal, error) {
-	var dp11 market11.DealProposal
-	if err := dp11.UnmarshalCBOR(bytes.NewReader(val.Raw)); err != nil {
-		return nil, err
-	}
-
-	dp, err := fromV11DealProposal(dp11)
-	if err != nil {
-		return nil, err
-	}
-
-	return &dp, nil
-}
-
-func (s *dealProposals11) array() adt.Array {
-	return s.Array
-}
-
-func fromV11DealProposal(v11 market11.DealProposal) (DealProposal, error) {
-
-	label, err := fromV11Label(v11.Label)
-
-	if err != nil {
-		return DealProposal{}, xerrors.Errorf("error setting deal label: %w", err)
-	}
-
-	return DealProposal{
-		PieceCID:     v11.PieceCID,
-		PieceSize:    v11.PieceSize,
-		VerifiedDeal: v11.VerifiedDeal,
-		Client:       v11.Client,
-		Provider:     v11.Provider,
-
-		Label: label,
-
-		StartEpoch:           v11.StartEpoch,
-		EndEpoch:             v11.EndEpoch,
-		StoragePricePerEpoch: v11.StoragePricePerEpoch,
-
-		ProviderCollateral: v11.ProviderCollateral,
-		ClientCollateral:   v11.ClientCollateral,
-	}, nil
-}
-
-func fromV11Label(v11 market11.DealLabel) (DealLabel, error) {
-	if v11.IsString() {
-		str, err := v11.ToString()
-		if err != nil {
-			return markettypes.EmptyDealLabel, xerrors.Errorf("failed to convert string label to string: %w", err)
-		}
-		return markettypes.NewLabelFromString(str)
-	}
-
-	bs, err := v11.ToBytes()
-	if err != nil {
-		return markettypes.EmptyDealLabel, xerrors.Errorf("failed to convert bytes label to bytes: %w", err)
-	}
-	return markettypes.NewLabelFromBytes(bs)
-}
-
-func (s *state11) GetState() interface{} {
-	return &s.State
-}
-
-var _ PublishStorageDealsReturn = (*publishStorageDealsReturn11)(nil)
-
-func decodePublishStorageDealsReturn11(b []byte) (PublishStorageDealsReturn, error) {
-	var retval market11.PublishStorageDealsReturn
-	if err := retval.UnmarshalCBOR(bytes.NewReader(b)); err != nil {
-		return nil, xerrors.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err)
-	}
-
-	return &publishStorageDealsReturn11{retval}, nil
-}
-
-type publishStorageDealsReturn11 struct {
-	market11.PublishStorageDealsReturn
-}
-
-func (r *publishStorageDealsReturn11) IsDealValid(index uint64) (bool, int, error) {
-
-	set, err := r.ValidDeals.IsSet(index)
-	if err != nil || !set {
-		return false, -1, err
-	}
-	maskBf, err := bitfield.NewFromIter(&rlepluslazy.RunSliceIterator{
-		Runs: []rlepluslazy.Run{rlepluslazy.Run{Val: true, Len: index}}})
-	if err != nil {
-		return false, -1, err
-	}
-	before, err := bitfield.IntersectBitField(maskBf, r.ValidDeals)
-	if err != nil {
-		return false, -1, err
-	}
-	outIdx, err := before.Count()
-	if err != nil {
-		return false, -1, err
-	}
-	return set, int(outIdx), nil
-
-}
-
-func (r *publishStorageDealsReturn11) DealIDs() ([]abi.DealID, error) {
-	return r.IDs, nil
-}
-
-func (s *state11) GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes.AllocationId, error) {
-
-	allocations, err := adt11.AsMap(s.store, s.PendingDealAllocationIds, builtin.DefaultHamtBitwidth)
-	if err != nil {
-		return verifregtypes.NoAllocationID, xerrors.Errorf("failed to load allocation id for %d: %w", dealId, err)
-	}
-
-	var allocationId cbg.CborInt
-	found, err := allocations.Get(abi.UIntKey(uint64(dealId)), &allocationId)
-	if err != nil {
-		return verifregtypes.NoAllocationID, xerrors.Errorf("failed to load allocation id for %d: %w", dealId, err)
-	}
-	if !found {
-		return verifregtypes.NoAllocationID, nil
-	}
-
-	return verifregtypes.AllocationId(allocationId), nil
-
-}
-
-func (s *state11) ActorKey() string {
-	return manifest.MarketKey
-}
-
-func (s *state11) ActorVersion() actorstypes.Version {
-	return actorstypes.Version11
-}
-
-func (s *state11) Code() cid.Cid {
-	code, ok := actors.GetActorCodeID(s.ActorVersion(), s.ActorKey())
-	if !ok {
-		panic(fmt.Errorf("didn't find actor %v code id for actor version %d", s.ActorKey(), s.ActorVersion()))
-	}
-
-	return code
-}
@@ -175,15 +175,15 @@ func PreferredSealProofTypeFromWindowPoStType(nver network.Version, proof abi.Re
 	}

 	switch proof {
-	case abi.RegisteredPoStProof_StackedDrgWindow2KiBV1, abi.RegisteredPoStProof_StackedDrgWindow2KiBV1_1:
+	case abi.RegisteredPoStProof_StackedDrgWindow2KiBV1:
 		return abi.RegisteredSealProof_StackedDrg2KiBV1_1, nil
-	case abi.RegisteredPoStProof_StackedDrgWindow8MiBV1, abi.RegisteredPoStProof_StackedDrgWindow8MiBV1_1:
+	case abi.RegisteredPoStProof_StackedDrgWindow8MiBV1:
 		return abi.RegisteredSealProof_StackedDrg8MiBV1_1, nil
-	case abi.RegisteredPoStProof_StackedDrgWindow512MiBV1, abi.RegisteredPoStProof_StackedDrgWindow512MiBV1_1:
+	case abi.RegisteredPoStProof_StackedDrgWindow512MiBV1:
 		return abi.RegisteredSealProof_StackedDrg512MiBV1_1, nil
-	case abi.RegisteredPoStProof_StackedDrgWindow32GiBV1, abi.RegisteredPoStProof_StackedDrgWindow32GiBV1_1:
+	case abi.RegisteredPoStProof_StackedDrgWindow32GiBV1:
 		return abi.RegisteredSealProof_StackedDrg32GiBV1_1, nil
-	case abi.RegisteredPoStProof_StackedDrgWindow64GiBV1, abi.RegisteredPoStProof_StackedDrgWindow64GiBV1_1:
+	case abi.RegisteredPoStProof_StackedDrgWindow64GiBV1:
 		return abi.RegisteredSealProof_StackedDrg64GiBV1_1, nil
 	default:
 		return -1, xerrors.Errorf("unrecognized window post type: %d", proof)
@@ -192,15 +192,15 @@ func PreferredSealProofTypeFromWindowPoStType(nver network.Version, proof abi.Re

 func WinningPoStProofTypeFromWindowPoStProofType(nver network.Version, proof abi.RegisteredPoStProof) (abi.RegisteredPoStProof, error) {
 	switch proof {
-	case abi.RegisteredPoStProof_StackedDrgWindow2KiBV1, abi.RegisteredPoStProof_StackedDrgWindow2KiBV1_1:
+	case abi.RegisteredPoStProof_StackedDrgWindow2KiBV1:
 		return abi.RegisteredPoStProof_StackedDrgWinning2KiBV1, nil
-	case abi.RegisteredPoStProof_StackedDrgWindow8MiBV1, abi.RegisteredPoStProof_StackedDrgWindow8MiBV1_1:
+	case abi.RegisteredPoStProof_StackedDrgWindow8MiBV1:
 		return abi.RegisteredPoStProof_StackedDrgWinning8MiBV1, nil
-	case abi.RegisteredPoStProof_StackedDrgWindow512MiBV1, abi.RegisteredPoStProof_StackedDrgWindow512MiBV1_1:
+	case abi.RegisteredPoStProof_StackedDrgWindow512MiBV1:
 		return abi.RegisteredPoStProof_StackedDrgWinning512MiBV1, nil
-	case abi.RegisteredPoStProof_StackedDrgWindow32GiBV1, abi.RegisteredPoStProof_StackedDrgWindow32GiBV1_1:
+	case abi.RegisteredPoStProof_StackedDrgWindow32GiBV1:
 		return abi.RegisteredPoStProof_StackedDrgWinning32GiBV1, nil
-	case abi.RegisteredPoStProof_StackedDrgWindow64GiBV1, abi.RegisteredPoStProof_StackedDrgWindow64GiBV1_1:
+	case abi.RegisteredPoStProof_StackedDrgWindow64GiBV1:
 		return abi.RegisteredPoStProof_StackedDrgWinning64GiBV1, nil
 	default:
 		return -1, xerrors.Errorf("unknown proof type %d", proof)
@@ -45,9 +45,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version10:
 			return load10(store, act.Head)

-		case actorstypes.Version11:
-			return load11(store, act.Head)
-
 		}
 	}

@@ -112,9 +109,6 @@ func MakeState(store adt.Store, av actors.Version) (State, error) {
 	case actors.Version10:
 		return make10(store)

-	case actors.Version11:
-		return make11(store)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -229,15 +223,15 @@ func PreferredSealProofTypeFromWindowPoStType(nver network.Version, proof abi.Re
 	}

 	switch proof {
-	case abi.RegisteredPoStProof_StackedDrgWindow2KiBV1, abi.RegisteredPoStProof_StackedDrgWindow2KiBV1_1:
+	case abi.RegisteredPoStProof_StackedDrgWindow2KiBV1:
 		return abi.RegisteredSealProof_StackedDrg2KiBV1_1, nil
-	case abi.RegisteredPoStProof_StackedDrgWindow8MiBV1, abi.RegisteredPoStProof_StackedDrgWindow8MiBV1_1:
+	case abi.RegisteredPoStProof_StackedDrgWindow8MiBV1:
 		return abi.RegisteredSealProof_StackedDrg8MiBV1_1, nil
-	case abi.RegisteredPoStProof_StackedDrgWindow512MiBV1, abi.RegisteredPoStProof_StackedDrgWindow512MiBV1_1:
+	case abi.RegisteredPoStProof_StackedDrgWindow512MiBV1:
 		return abi.RegisteredSealProof_StackedDrg512MiBV1_1, nil
-	case abi.RegisteredPoStProof_StackedDrgWindow32GiBV1, abi.RegisteredPoStProof_StackedDrgWindow32GiBV1_1:
+	case abi.RegisteredPoStProof_StackedDrgWindow32GiBV1:
 		return abi.RegisteredSealProof_StackedDrg32GiBV1_1, nil
-	case abi.RegisteredPoStProof_StackedDrgWindow64GiBV1, abi.RegisteredPoStProof_StackedDrgWindow64GiBV1_1:
+	case abi.RegisteredPoStProof_StackedDrgWindow64GiBV1:
 		return abi.RegisteredSealProof_StackedDrg64GiBV1_1, nil
 	default:
 		return -1, xerrors.Errorf("unrecognized window post type: %d", proof)
@@ -246,15 +240,15 @@ func PreferredSealProofTypeFromWindowPoStType(nver network.Version, proof abi.Re

 func WinningPoStProofTypeFromWindowPoStProofType(nver network.Version, proof abi.RegisteredPoStProof) (abi.RegisteredPoStProof, error) {
 	switch proof {
-	case abi.RegisteredPoStProof_StackedDrgWindow2KiBV1, abi.RegisteredPoStProof_StackedDrgWindow2KiBV1_1:
+	case abi.RegisteredPoStProof_StackedDrgWindow2KiBV1:
 		return abi.RegisteredPoStProof_StackedDrgWinning2KiBV1, nil
-	case abi.RegisteredPoStProof_StackedDrgWindow8MiBV1, abi.RegisteredPoStProof_StackedDrgWindow8MiBV1_1:
+	case abi.RegisteredPoStProof_StackedDrgWindow8MiBV1:
 		return abi.RegisteredPoStProof_StackedDrgWinning8MiBV1, nil
-	case abi.RegisteredPoStProof_StackedDrgWindow512MiBV1, abi.RegisteredPoStProof_StackedDrgWindow512MiBV1_1:
+	case abi.RegisteredPoStProof_StackedDrgWindow512MiBV1:
 		return abi.RegisteredPoStProof_StackedDrgWinning512MiBV1, nil
-	case abi.RegisteredPoStProof_StackedDrgWindow32GiBV1, abi.RegisteredPoStProof_StackedDrgWindow32GiBV1_1:
+	case abi.RegisteredPoStProof_StackedDrgWindow32GiBV1:
 		return abi.RegisteredPoStProof_StackedDrgWinning32GiBV1, nil
-	case abi.RegisteredPoStProof_StackedDrgWindow64GiBV1, abi.RegisteredPoStProof_StackedDrgWindow64GiBV1_1:
+	case abi.RegisteredPoStProof_StackedDrgWindow64GiBV1:
 		return abi.RegisteredPoStProof_StackedDrgWinning64GiBV1, nil
 	default:
 		return -1, xerrors.Errorf("unknown proof type %d", proof)
@@ -320,6 +314,5 @@ func AllCodes() []cid.Cid {
 		(&state8{}).Code(),
 		(&state9{}).Code(),
 		(&state10{}).Code(),
-		(&state11{}).Code(),
 	}
 }
@@ -1,591 +0,0 @@
-package miner
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-
-	"github.com/ipfs/go-cid"
-	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
-
-	"github.com/filecoin-project/go-bitfield"
-	rle "github.com/filecoin-project/go-bitfield/rle"
-	"github.com/filecoin-project/go-state-types/abi"
-	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtin11 "github.com/filecoin-project/go-state-types/builtin"
-	miner11 "github.com/filecoin-project/go-state-types/builtin/v11/miner"
-	adt11 "github.com/filecoin-project/go-state-types/builtin/v11/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"
-)
-
-var _ State = (*state11)(nil)
-
-func load11(store adt.Store, root cid.Cid) (State, error) {
-	out := state11{store: store}
-	err := store.Get(store.Context(), root, &out)
-	if err != nil {
-		return nil, err
-	}
-	return &out, nil
-}
-
-func make11(store adt.Store) (State, error) {
-	out := state11{store: store}
-	out.State = miner11.State{}
-	return &out, nil
-}
-
-type state11 struct {
-	miner11.State
-	store adt.Store
-}
-
-type deadline11 struct {
-	miner11.Deadline
-	store adt.Store
-}
-
-type partition11 struct {
-	miner11.Partition
-	store adt.Store
-}
-
-func (s *state11) AvailableBalance(bal abi.TokenAmount) (available abi.TokenAmount, err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			err = xerrors.Errorf("failed to get available balance: %w", r)
-			available = abi.NewTokenAmount(0)
-		}
-	}()
-	// this panics if the miner doesnt have enough funds to cover their locked pledge
-	available, err = s.GetAvailableBalance(bal)
-	return available, err
-}
-
-func (s *state11) VestedFunds(epoch abi.ChainEpoch) (abi.TokenAmount, error) {
-	return s.CheckVestedFunds(s.store, epoch)
-}
-
-func (s *state11) LockedFunds() (LockedFunds, error) {
-	return LockedFunds{
-		VestingFunds:             s.State.LockedFunds,
-		InitialPledgeRequirement: s.State.InitialPledge,
-		PreCommitDeposits:        s.State.PreCommitDeposits,
-	}, nil
-}
-
-func (s *state11) FeeDebt() (abi.TokenAmount, error) {
-	return s.State.FeeDebt, nil
-}
-
-func (s *state11) InitialPledge() (abi.TokenAmount, error) {
-	return s.State.InitialPledge, nil
-}
-
-func (s *state11) PreCommitDeposits() (abi.TokenAmount, error) {
-	return s.State.PreCommitDeposits, nil
-}
-
-// Returns nil, nil if sector is not found
-func (s *state11) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) {
-	info, ok, err := s.State.GetSector(s.store, num)
-	if !ok || err != nil {
-		return nil, err
-	}
-
-	ret := fromV11SectorOnChainInfo(*info)
-	return &ret, nil
-}
-
-func (s *state11) FindSector(num abi.SectorNumber) (*SectorLocation, error) {
-	dlIdx, partIdx, err := s.State.FindSector(s.store, num)
-	if err != nil {
-		return nil, err
-	}
-	return &SectorLocation{
-		Deadline:  dlIdx,
-		Partition: partIdx,
-	}, nil
-}
-
-func (s *state11) NumLiveSectors() (uint64, error) {
-	dls, err := s.State.LoadDeadlines(s.store)
-	if err != nil {
-		return 0, err
-	}
-	var total uint64
-	if err := dls.ForEach(s.store, func(dlIdx uint64, dl *miner11.Deadline) error {
-		total += dl.LiveSectors
-		return nil
-	}); err != nil {
-		return 0, err
-	}
-	return total, nil
-}
-
-// GetSectorExpiration returns the effective expiration of the given sector.
-//
-// If the sector does not expire early, the Early expiration field is 0.
-func (s *state11) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, error) {
-	dls, err := s.State.LoadDeadlines(s.store)
-	if err != nil {
-		return nil, err
-	}
-	// NOTE: this can be optimized significantly.
-	// 1. If the sector is non-faulty, it will expire on-time (can be
-	// learned from the sector info).
-	// 2. If it's faulty, it will expire early within the first 42 entries
-	// of the expiration queue.
-
-	stopErr := errors.New("stop")
-	out := SectorExpiration{}
-	err = dls.ForEach(s.store, func(dlIdx uint64, dl *miner11.Deadline) error {
-		partitions, err := dl.PartitionsArray(s.store)
-		if err != nil {
-			return err
-		}
-		quant := s.State.QuantSpecForDeadline(dlIdx)
-		var part miner11.Partition
-		return partitions.ForEach(&part, func(partIdx int64) error {
-			if found, err := part.Sectors.IsSet(uint64(num)); err != nil {
-				return err
-			} else if !found {
-				return nil
-			}
-			if found, err := part.Terminated.IsSet(uint64(num)); err != nil {
-				return err
-			} else if found {
-				// already terminated
-				return stopErr
-			}
-
-			q, err := miner11.LoadExpirationQueue(s.store, part.ExpirationsEpochs, quant, miner11.PartitionExpirationAmtBitwidth)
-			if err != nil {
-				return err
-			}
-			var exp miner11.ExpirationSet
-			return q.ForEach(&exp, func(epoch int64) error {
-				if early, err := exp.EarlySectors.IsSet(uint64(num)); err != nil {
-					return err
-				} else if early {
-					out.Early = abi.ChainEpoch(epoch)
-					return nil
-				}
-				if onTime, err := exp.OnTimeSectors.IsSet(uint64(num)); err != nil {
-					return err
-				} else if onTime {
-					out.OnTime = abi.ChainEpoch(epoch)
-					return stopErr
-				}
-				return nil
-			})
-		})
-	})
-	if err == stopErr {
-		err = nil
-	}
-	if err != nil {
-		return nil, err
-	}
-	if out.Early == 0 && out.OnTime == 0 {
-		return nil, xerrors.Errorf("failed to find sector %d", num)
-	}
-	return &out, nil
-}
-
-func (s *state11) GetPrecommittedSector(num abi.SectorNumber) (*SectorPreCommitOnChainInfo, error) {
-	info, ok, err := s.State.GetPrecommittedSector(s.store, num)
-	if !ok || err != nil {
-		return nil, err
-	}
-
-	ret := fromV11SectorPreCommitOnChainInfo(*info)
-
-	return &ret, nil
-}
-
-func (s *state11) ForEachPrecommittedSector(cb func(SectorPreCommitOnChainInfo) error) error {
-	precommitted, err := adt11.AsMap(s.store, s.State.PreCommittedSectors, builtin11.DefaultHamtBitwidth)
-	if err != nil {
-		return err
-	}
-
-	var info miner11.SectorPreCommitOnChainInfo
-	if err := precommitted.ForEach(&info, func(_ string) error {
-		return cb(fromV11SectorPreCommitOnChainInfo(info))
-	}); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (s *state11) LoadSectors(snos *bitfield.BitField) ([]*SectorOnChainInfo, error) {
-	sectors, err := miner11.LoadSectors(s.store, s.State.Sectors)
-	if err != nil {
-		return nil, err
-	}
-
-	// If no sector numbers are specified, load all.
-	if snos == nil {
-		infos := make([]*SectorOnChainInfo, 0, sectors.Length())
-		var info11 miner11.SectorOnChainInfo
-		if err := sectors.ForEach(&info11, func(_ int64) error {
-			info := fromV11SectorOnChainInfo(info11)
-			infos = append(infos, &info)
-			return nil
-		}); err != nil {
-			return nil, err
-		}
-		return infos, nil
-	}
-
-	// Otherwise, load selected.
-	infos11, err := sectors.Load(*snos)
-	if err != nil {
-		return nil, err
-	}
-	infos := make([]*SectorOnChainInfo, len(infos11))
-	for i, info11 := range infos11 {
-		info := fromV11SectorOnChainInfo(*info11)
-		infos[i] = &info
-	}
-	return infos, nil
-}
-
-func (s *state11) loadAllocatedSectorNumbers() (bitfield.BitField, error) {
-	var allocatedSectors bitfield.BitField
-	err := s.store.Get(s.store.Context(), s.State.AllocatedSectors, &allocatedSectors)
-	return allocatedSectors, err
-}
-
-func (s *state11) IsAllocated(num abi.SectorNumber) (bool, error) {
-	allocatedSectors, err := s.loadAllocatedSectorNumbers()
-	if err != nil {
-		return false, err
-	}
-
-	return allocatedSectors.IsSet(uint64(num))
-}
-
-func (s *state11) GetProvingPeriodStart() (abi.ChainEpoch, error) {
-	return s.State.ProvingPeriodStart, nil
-}
-
-func (s *state11) UnallocatedSectorNumbers(count int) ([]abi.SectorNumber, error) {
-	allocatedSectors, err := s.loadAllocatedSectorNumbers()
-	if err != nil {
-		return nil, err
-	}
-
-	allocatedRuns, err := allocatedSectors.RunIterator()
-	if err != nil {
-		return nil, err
-	}
-
-	unallocatedRuns, err := rle.Subtract(
-		&rle.RunSliceIterator{Runs: []rle.Run{{Val: true, Len: abi.MaxSectorNumber}}},
-		allocatedRuns,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	iter, err := rle.BitsFromRuns(unallocatedRuns)
-	if err != nil {
-		return nil, err
-	}
-
-	sectors := make([]abi.SectorNumber, 0, count)
-	for iter.HasNext() && len(sectors) < count {
-		nextNo, err := iter.Next()
-		if err != nil {
-			return nil, err
-		}
-		sectors = append(sectors, abi.SectorNumber(nextNo))
-	}
-
-	return sectors, nil
-}
-
-func (s *state11) GetAllocatedSectors() (*bitfield.BitField, error) {
-	var allocatedSectors bitfield.BitField
-	if err := s.store.Get(s.store.Context(), s.State.AllocatedSectors, &allocatedSectors); err != nil {
-		return nil, err
-	}
-
-	return &allocatedSectors, nil
-}
-
-func (s *state11) LoadDeadline(idx uint64) (Deadline, error) {
-	dls, err := s.State.LoadDeadlines(s.store)
-	if err != nil {
-		return nil, err
-	}
-	dl, err := dls.LoadDeadline(s.store, idx)
-	if err != nil {
-		return nil, err
-	}
-	return &deadline11{*dl, s.store}, nil
-}
-
-func (s *state11) ForEachDeadline(cb func(uint64, Deadline) error) error {
-	dls, err := s.State.LoadDeadlines(s.store)
-	if err != nil {
-		return err
-	}
-	return dls.ForEach(s.store, func(i uint64, dl *miner11.Deadline) error {
-		return cb(i, &deadline11{*dl, s.store})
-	})
-}
-
-func (s *state11) NumDeadlines() (uint64, error) {
-	return miner11.WPoStPeriodDeadlines, nil
-}
-
-func (s *state11) DeadlinesChanged(other State) (bool, error) {
-	other11, ok := other.(*state11)
-	if !ok {
-		// treat an upgrade as a change, always
-		return true, nil
-	}
-
-	return !s.State.Deadlines.Equals(other11.Deadlines), nil
-}
-
-func (s *state11) MinerInfoChanged(other State) (bool, error) {
-	other0, ok := other.(*state11)
-	if !ok {
-		// treat an upgrade as a change, always
-		return true, nil
-	}
-	return !s.State.Info.Equals(other0.State.Info), nil
-}
-
-func (s *state11) Info() (MinerInfo, error) {
-	info, err := s.State.GetInfo(s.store)
-	if err != nil {
-		return MinerInfo{}, err
-	}
-
-	mi := MinerInfo{
-		Owner:            info.Owner,
-		Worker:           info.Worker,
-		ControlAddresses: info.ControlAddresses,
-
-		PendingWorkerKey: (*WorkerKeyChange)(info.PendingWorkerKey),
-
-		PeerId:                     info.PeerId,
-		Multiaddrs:                 info.Multiaddrs,
-		WindowPoStProofType:        info.WindowPoStProofType,
-		SectorSize:                 info.SectorSize,
-		WindowPoStPartitionSectors: info.WindowPoStPartitionSectors,
-		ConsensusFaultElapsed:      info.ConsensusFaultElapsed,
-
-		Beneficiary:            info.Beneficiary,
-		BeneficiaryTerm:        BeneficiaryTerm(info.BeneficiaryTerm),
-		PendingBeneficiaryTerm: (*PendingBeneficiaryChange)(info.PendingBeneficiaryTerm),
-	}
-
-	return mi, nil
-}
-
-func (s *state11) DeadlineInfo(epoch abi.ChainEpoch) (*dline.Info, error) {
-	return s.State.RecordedDeadlineInfo(epoch), nil
-}
-
-func (s *state11) DeadlineCronActive() (bool, error) {
-	return s.State.DeadlineCronActive, nil
-}
-
-func (s *state11) sectors() (adt.Array, error) {
-	return adt11.AsArray(s.store, s.Sectors, miner11.SectorsAmtBitwidth)
-}
-
-func (s *state11) decodeSectorOnChainInfo(val *cbg.Deferred) (SectorOnChainInfo, error) {
-	var si miner11.SectorOnChainInfo
-	err := si.UnmarshalCBOR(bytes.NewReader(val.Raw))
-	if err != nil {
-		return SectorOnChainInfo{}, err
-	}
-
-	return fromV11SectorOnChainInfo(si), nil
-}
-
-func (s *state11) precommits() (adt.Map, error) {
-	return adt11.AsMap(s.store, s.PreCommittedSectors, builtin11.DefaultHamtBitwidth)
-}
-
-func (s *state11) decodeSectorPreCommitOnChainInfo(val *cbg.Deferred) (SectorPreCommitOnChainInfo, error) {
-	var sp miner11.SectorPreCommitOnChainInfo
-	err := sp.UnmarshalCBOR(bytes.NewReader(val.Raw))
-	if err != nil {
-		return SectorPreCommitOnChainInfo{}, err
-	}
-
-	return fromV11SectorPreCommitOnChainInfo(sp), nil
-}
-
-func (s *state11) EraseAllUnproven() error {
-
-	dls, err := s.State.LoadDeadlines(s.store)
-	if err != nil {
-		return err
-	}
-
-	err = dls.ForEach(s.store, func(dindx uint64, dl *miner11.Deadline) error {
-		ps, err := dl.PartitionsArray(s.store)
-		if err != nil {
-			return err
-		}
-
-		var part miner11.Partition
-		err = ps.ForEach(&part, func(pindx int64) error {
-			_ = part.ActivateUnproven()
-			err = ps.Set(uint64(pindx), &part)
-			return nil
-		})
-
-		if err != nil {
-			return err
-		}
-
-		dl.Partitions, err = ps.Root()
-		if err != nil {
-			return err
-		}
-
-		return dls.UpdateDeadline(s.store, dindx, dl)
-	})
-	if err != nil {
-		return err
-	}
-
-	return s.State.SaveDeadlines(s.store, dls)
-
-}
-
-func (d *deadline11) LoadPartition(idx uint64) (Partition, error) {
-	p, err := d.Deadline.LoadPartition(d.store, idx)
-	if err != nil {
-		return nil, err
-	}
-	return &partition11{*p, d.store}, nil
-}
-
-func (d *deadline11) ForEachPartition(cb func(uint64, Partition) error) error {
-	ps, err := d.Deadline.PartitionsArray(d.store)
-	if err != nil {
-		return err
-	}
-	var part miner11.Partition
-	return ps.ForEach(&part, func(i int64) error {
-		return cb(uint64(i), &partition11{part, d.store})
-	})
-}
-
-func (d *deadline11) PartitionsChanged(other Deadline) (bool, error) {
-	other11, ok := other.(*deadline11)
-	if !ok {
-		// treat an upgrade as a change, always
-		return true, nil
-	}
-
-	return !d.Deadline.Partitions.Equals(other11.Deadline.Partitions), nil
-}
-
-func (d *deadline11) PartitionsPoSted() (bitfield.BitField, error) {
-	return d.Deadline.PartitionsPoSted, nil
-}
-
-func (d *deadline11) DisputableProofCount() (uint64, error) {
-
-	ops, err := d.OptimisticProofsSnapshotArray(d.store)
-	if err != nil {
-		return 0, err
-	}
-
-	return ops.Length(), nil
-
-}
-
-func (p *partition11) AllSectors() (bitfield.BitField, error) {
-	return p.Partition.Sectors, nil
-}
-
-func (p *partition11) FaultySectors() (bitfield.BitField, error) {
-	return p.Partition.Faults, nil
-}
-
-func (p *partition11) RecoveringSectors() (bitfield.BitField, error) {
-	return p.Partition.Recoveries, nil
-}
-
-func (p *partition11) UnprovenSectors() (bitfield.BitField, error) {
-	return p.Partition.Unproven, nil
-}
-
-func fromV11SectorOnChainInfo(v11 miner11.SectorOnChainInfo) SectorOnChainInfo {
-	info := SectorOnChainInfo{
-		SectorNumber:          v11.SectorNumber,
-		SealProof:             v11.SealProof,
-		SealedCID:             v11.SealedCID,
-		DealIDs:               v11.DealIDs,
-		Activation:            v11.Activation,
-		Expiration:            v11.Expiration,
-		DealWeight:            v11.DealWeight,
-		VerifiedDealWeight:    v11.VerifiedDealWeight,
-		InitialPledge:         v11.InitialPledge,
-		ExpectedDayReward:     v11.ExpectedDayReward,
-		ExpectedStoragePledge: v11.ExpectedStoragePledge,
-
-		SectorKeyCID: v11.SectorKeyCID,
-	}
-	return info
-}
-
-func fromV11SectorPreCommitOnChainInfo(v11 miner11.SectorPreCommitOnChainInfo) SectorPreCommitOnChainInfo {
-	ret := SectorPreCommitOnChainInfo{
-		Info: SectorPreCommitInfo{
-			SealProof:     v11.Info.SealProof,
-			SectorNumber:  v11.Info.SectorNumber,
-			SealedCID:     v11.Info.SealedCID,
-			SealRandEpoch: v11.Info.SealRandEpoch,
-			DealIDs:       v11.Info.DealIDs,
-			Expiration:    v11.Info.Expiration,
-			UnsealedCid:   nil,
-		},
-		PreCommitDeposit: v11.PreCommitDeposit,
-		PreCommitEpoch:   v11.PreCommitEpoch,
-	}
-
-	ret.Info.UnsealedCid = v11.Info.UnsealedCid
-
-	return ret
-}
-
-func (s *state11) GetState() interface{} {
-	return &s.State
-}
-
-func (s *state11) ActorKey() string {
-	return manifest.MinerKey
-}
-
-func (s *state11) ActorVersion() actorstypes.Version {
-	return actorstypes.Version11
-}
-
-func (s *state11) Code() cid.Cid {
-	code, ok := actors.GetActorCodeID(s.ActorVersion(), s.ActorKey())
-	if !ok {
-		panic(fmt.Errorf("didn't find actor %v code id for actor version %d", s.ActorKey(), s.ActorVersion()))
-	}
-
-	return code
-}
@@ -7,8 +7,8 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	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"
-	init11 "github.com/filecoin-project/go-state-types/builtin/v11/init"
 	"github.com/filecoin-project/go-state-types/manifest"

 	"github.com/filecoin-project/lotus/chain/actors"
@@ -57,7 +57,7 @@ func (m message10) Create(
 	}

 	// new actors are created by invoking 'exec' on the init actor with the constructor params
-	execParams := &init11.ExecParams{
+	execParams := &init10.ExecParams{
 		CodeCID:           code,
 		ConstructorParams: enc,
 	}
@@ -1,77 +0,0 @@
-package multisig
-
-import (
-	"golang.org/x/xerrors"
-
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtintypes "github.com/filecoin-project/go-state-types/builtin"
-	init11 "github.com/filecoin-project/go-state-types/builtin/v11/init"
-	multisig11 "github.com/filecoin-project/go-state-types/builtin/v11/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"
-	"github.com/filecoin-project/lotus/chain/types"
-)
-
-type message11 struct{ message0 }
-
-func (m message11) Create(
-	signers []address.Address, threshold uint64,
-	unlockStart, unlockDuration abi.ChainEpoch,
-	initialAmount abi.TokenAmount,
-) (*types.Message, error) {
-
-	lenAddrs := uint64(len(signers))
-
-	if lenAddrs < threshold {
-		return nil, xerrors.Errorf("cannot require signing of more addresses than provided for multisig")
-	}
-
-	if threshold == 0 {
-		threshold = lenAddrs
-	}
-
-	if m.from == address.Undef {
-		return nil, xerrors.Errorf("must provide source address")
-	}
-
-	// Set up constructor parameters for multisig
-	msigParams := &multisig11.ConstructorParams{
-		Signers:               signers,
-		NumApprovalsThreshold: threshold,
-		UnlockDuration:        unlockDuration,
-		StartEpoch:            unlockStart,
-	}
-
-	enc, actErr := actors.SerializeParams(msigParams)
-	if actErr != nil {
-		return nil, actErr
-	}
-
-	code, ok := actors.GetActorCodeID(actorstypes.Version11, manifest.MultisigKey)
-	if !ok {
-		return nil, xerrors.Errorf("failed to get multisig code ID")
-	}
-
-	// new actors are created by invoking 'exec' on the init actor with the constructor params
-	execParams := &init11.ExecParams{
-		CodeCID:           code,
-		ConstructorParams: enc,
-	}
-
-	enc, actErr = actors.SerializeParams(execParams)
-	if actErr != nil {
-		return nil, actErr
-	}
-
-	return &types.Message{
-		To:     init_.Address,
-		From:   m.from,
-		Method: builtintypes.MethodsInit.Exec,
-		Params: enc,
-		Value:  initialAmount,
-	}, nil
-}
@@ -7,7 +7,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	builtintypes "github.com/filecoin-project/go-state-types/builtin"
-	init11 "github.com/filecoin-project/go-state-types/builtin/v11/init"
+	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"

@@ -57,7 +57,7 @@ func (m message8) Create(
 	}

 	// new actors are created by invoking 'exec' on the init actor with the constructor params
-	execParams := &init11.ExecParams{
+	execParams := &init10.ExecParams{
 		CodeCID:           code,
 		ConstructorParams: enc,
 	}
@@ -7,7 +7,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	builtintypes "github.com/filecoin-project/go-state-types/builtin"
-	init11 "github.com/filecoin-project/go-state-types/builtin/v11/init"
+	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"

@@ -57,7 +57,7 @@ func (m message9) Create(
 	}

 	// new actors are created by invoking 'exec' on the init actor with the constructor params
-	execParams := &init11.ExecParams{
+	execParams := &init10.ExecParams{
 		CodeCID:           code,
 		ConstructorParams: enc,
 	}
@@ -12,7 +12,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	builtintypes "github.com/filecoin-project/go-state-types/builtin"
-	msig11 "github.com/filecoin-project/go-state-types/builtin/v11/multisig"
+	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"
@@ -45,9 +45,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version10:
 			return load10(store, act.Head)

-		case actorstypes.Version11:
-			return load11(store, act.Head)
-
 		}
 	}

@@ -112,9 +109,6 @@ func MakeState(store adt.Store, av actorstypes.Version, signers []address.Addres
 	case actorstypes.Version10:
 		return make10(store, signers, threshold, startEpoch, unlockDuration, initialBalance)

-	case actorstypes.Version11:
-		return make11(store, signers, threshold, startEpoch, unlockDuration, initialBalance)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -141,7 +135,7 @@ type State interface {
 	GetState() interface{}
 }

-type Transaction = msig11.Transaction
+type Transaction = msig10.Transaction

 var Methods = builtintypes.MethodsMultisig

@@ -177,9 +171,6 @@ func Message(version actorstypes.Version, from address.Address) MessageBuilder {

 	case actorstypes.Version10:
 		return message10{message0{from}}
-
-	case actorstypes.Version11:
-		return message11{message0{from}}
 	default:
 		panic(fmt.Sprintf("unsupported actors version: %d", version))
 	}
@@ -203,13 +194,13 @@ type MessageBuilder interface {
 }

 // this type is the same between v0 and v2
-type ProposalHashData = msig11.ProposalHashData
-type ProposeReturn = msig11.ProposeReturn
-type ProposeParams = msig11.ProposeParams
-type ApproveReturn = msig11.ApproveReturn
+type ProposalHashData = msig10.ProposalHashData
+type ProposeReturn = msig10.ProposeReturn
+type ProposeParams = msig10.ProposeParams
+type ApproveReturn = msig10.ApproveReturn

 func txnParams(id uint64, data *ProposalHashData) ([]byte, error) {
-	params := msig11.TxnIDParams{ID: msig11.TxnID(id)}
+	params := msig10.TxnIDParams{ID: msig10.TxnID(id)}
 	if data != nil {
 		if data.Requester.Protocol() != address.ID {
 			return nil, xerrors.Errorf("proposer address must be an ID address, was %s", data.Requester)
@@ -243,6 +234,5 @@ func AllCodes() []cid.Cid {
 		(&state8{}).Code(),
 		(&state9{}).Code(),
 		(&state10{}).Code(),
-		(&state11{}).Code(),
 	}
 }
@@ -1,138 +0,0 @@
-package multisig
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-
-	"github.com/ipfs/go-cid"
-	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
-
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtin11 "github.com/filecoin-project/go-state-types/builtin"
-	msig11 "github.com/filecoin-project/go-state-types/builtin/v11/multisig"
-	adt11 "github.com/filecoin-project/go-state-types/builtin/v11/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"
-)
-
-var _ State = (*state11)(nil)
-
-func load11(store adt.Store, root cid.Cid) (State, error) {
-	out := state11{store: store}
-	err := store.Get(store.Context(), root, &out)
-	if err != nil {
-		return nil, err
-	}
-	return &out, nil
-}
-
-func make11(store adt.Store, signers []address.Address, threshold uint64, startEpoch abi.ChainEpoch, unlockDuration abi.ChainEpoch, initialBalance abi.TokenAmount) (State, error) {
-	out := state11{store: store}
-	out.State = msig11.State{}
-	out.State.Signers = signers
-	out.State.NumApprovalsThreshold = threshold
-	out.State.StartEpoch = startEpoch
-	out.State.UnlockDuration = unlockDuration
-	out.State.InitialBalance = initialBalance
-
-	em, err := adt11.StoreEmptyMap(store, builtin11.DefaultHamtBitwidth)
-	if err != nil {
-		return nil, err
-	}
-
-	out.State.PendingTxns = em
-
-	return &out, nil
-}
-
-type state11 struct {
-	msig11.State
-	store adt.Store
-}
-
-func (s *state11) LockedBalance(currEpoch abi.ChainEpoch) (abi.TokenAmount, error) {
-	return s.State.AmountLocked(currEpoch - s.State.StartEpoch), nil
-}
-
-func (s *state11) StartEpoch() (abi.ChainEpoch, error) {
-	return s.State.StartEpoch, nil
-}
-
-func (s *state11) UnlockDuration() (abi.ChainEpoch, error) {
-	return s.State.UnlockDuration, nil
-}
-
-func (s *state11) InitialBalance() (abi.TokenAmount, error) {
-	return s.State.InitialBalance, nil
-}
-
-func (s *state11) Threshold() (uint64, error) {
-	return s.State.NumApprovalsThreshold, nil
-}
-
-func (s *state11) Signers() ([]address.Address, error) {
-	return s.State.Signers, nil
-}
-
-func (s *state11) ForEachPendingTxn(cb func(id int64, txn Transaction) error) error {
-	arr, err := adt11.AsMap(s.store, s.State.PendingTxns, builtin11.DefaultHamtBitwidth)
-	if err != nil {
-		return err
-	}
-	var out msig11.Transaction
-	return arr.ForEach(&out, func(key string) error {
-		txid, n := binary.Varint([]byte(key))
-		if n <= 0 {
-			return xerrors.Errorf("invalid pending transaction key: %v", key)
-		}
-		return cb(txid, (Transaction)(out)) //nolint:unconvert
-	})
-}
-
-func (s *state11) PendingTxnChanged(other State) (bool, error) {
-	other11, ok := other.(*state11)
-	if !ok {
-		// treat an upgrade as a change, always
-		return true, nil
-	}
-	return !s.State.PendingTxns.Equals(other11.PendingTxns), nil
-}
-
-func (s *state11) transactions() (adt.Map, error) {
-	return adt11.AsMap(s.store, s.PendingTxns, builtin11.DefaultHamtBitwidth)
-}
-
-func (s *state11) decodeTransaction(val *cbg.Deferred) (Transaction, error) {
-	var tx msig11.Transaction
-	if err := tx.UnmarshalCBOR(bytes.NewReader(val.Raw)); err != nil {
-		return Transaction{}, err
-	}
-	return Transaction(tx), nil
-}
-
-func (s *state11) GetState() interface{} {
-	return &s.State
-}
-
-func (s *state11) ActorKey() string {
-	return manifest.MultisigKey
-}
-
-func (s *state11) ActorVersion() actorstypes.Version {
-	return actorstypes.Version11
-}
-
-func (s *state11) Code() cid.Cid {
-	code, ok := actors.GetActorCodeID(s.ActorVersion(), s.ActorKey())
-	if !ok {
-		panic(fmt.Errorf("didn't find actor %v code id for actor version %d", s.ActorKey(), s.ActorVersion()))
-	}
-
-	return code
-}
@@ -1,109 +0,0 @@
-package paych
-
-import (
-	"golang.org/x/xerrors"
-
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtin11 "github.com/filecoin-project/go-state-types/builtin"
-	init11 "github.com/filecoin-project/go-state-types/builtin/v11/init"
-	paych11 "github.com/filecoin-project/go-state-types/builtin/v11/paych"
-	paychtypes "github.com/filecoin-project/go-state-types/builtin/v8/paych"
-
-	"github.com/filecoin-project/lotus/chain/actors"
-	init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
-	"github.com/filecoin-project/lotus/chain/types"
-)
-
-type message11 struct{ from address.Address }
-
-func (m message11) Create(to address.Address, initialAmount abi.TokenAmount) (*types.Message, error) {
-
-	actorCodeID, ok := actors.GetActorCodeID(actorstypes.Version11, "paymentchannel")
-	if !ok {
-		return nil, xerrors.Errorf("error getting actor paymentchannel code id for actor version %d", 11)
-	}
-
-	params, aerr := actors.SerializeParams(&paych11.ConstructorParams{From: m.from, To: to})
-	if aerr != nil {
-		return nil, aerr
-	}
-	enc, aerr := actors.SerializeParams(&init11.ExecParams{
-		CodeCID:           actorCodeID,
-		ConstructorParams: params,
-	})
-	if aerr != nil {
-		return nil, aerr
-	}
-
-	return &types.Message{
-		To:     init_.Address,
-		From:   m.from,
-		Value:  initialAmount,
-		Method: builtin11.MethodsInit.Exec,
-		Params: enc,
-	}, nil
-}
-
-func (m message11) Update(paych address.Address, sv *paychtypes.SignedVoucher, secret []byte) (*types.Message, error) {
-	params, aerr := actors.SerializeParams(&paych11.UpdateChannelStateParams{
-
-		Sv: toV11SignedVoucher(*sv),
-
-		Secret: secret,
-	})
-	if aerr != nil {
-		return nil, aerr
-	}
-
-	return &types.Message{
-		To:     paych,
-		From:   m.from,
-		Value:  abi.NewTokenAmount(0),
-		Method: builtin11.MethodsPaych.UpdateChannelState,
-		Params: params,
-	}, nil
-}
-
-func toV11SignedVoucher(sv paychtypes.SignedVoucher) paych11.SignedVoucher {
-	merges := make([]paych11.Merge, len(sv.Merges))
-	for i := range sv.Merges {
-		merges[i] = paych11.Merge{
-			Lane:  sv.Merges[i].Lane,
-			Nonce: sv.Merges[i].Nonce,
-		}
-	}
-
-	return paych11.SignedVoucher{
-		ChannelAddr:     sv.ChannelAddr,
-		TimeLockMin:     sv.TimeLockMin,
-		TimeLockMax:     sv.TimeLockMax,
-		SecretHash:      sv.SecretHash,
-		Extra:           (*paych11.ModVerifyParams)(sv.Extra),
-		Lane:            sv.Lane,
-		Nonce:           sv.Nonce,
-		Amount:          sv.Amount,
-		MinSettleHeight: sv.MinSettleHeight,
-		Merges:          merges,
-		Signature:       sv.Signature,
-	}
-}
-
-func (m message11) Settle(paych address.Address) (*types.Message, error) {
-	return &types.Message{
-		To:     paych,
-		From:   m.from,
-		Value:  abi.NewTokenAmount(0),
-		Method: builtin11.MethodsPaych.Settle,
-	}, nil
-}
-
-func (m message11) Collect(paych address.Address) (*types.Message, error) {
-	return &types.Message{
-		To:     paych,
-		From:   m.from,
-		Value:  abi.NewTokenAmount(0),
-		Method: builtin11.MethodsPaych.Collect,
-	}, nil
-}
@@ -47,9 +47,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version10:
 			return load10(store, act.Head)

-		case actorstypes.Version11:
-			return load11(store, act.Head)
-
 		}
 	}

@@ -164,9 +161,6 @@ func Message(version actorstypes.Version, from address.Address) MessageBuilder {
 	case actorstypes.Version10:
 		return message10{from}

-	case actorstypes.Version11:
-		return message11{from}
-
 	default:
 		panic(fmt.Sprintf("unsupported actors version: %d", version))
 	}
@@ -207,6 +201,5 @@ func AllCodes() []cid.Cid {
 		(&state8{}).Code(),
 		(&state9{}).Code(),
 		(&state10{}).Code(),
-		(&state11{}).Code(),
 	}
 }
@@ -1,135 +0,0 @@
-package paych
-
-import (
-	"fmt"
-
-	"github.com/ipfs/go-cid"
-
-	"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/big"
-	paych11 "github.com/filecoin-project/go-state-types/builtin/v11/paych"
-	adt11 "github.com/filecoin-project/go-state-types/builtin/v11/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"
-)
-
-var _ State = (*state11)(nil)
-
-func load11(store adt.Store, root cid.Cid) (State, error) {
-	out := state11{store: store}
-	err := store.Get(store.Context(), root, &out)
-	if err != nil {
-		return nil, err
-	}
-	return &out, nil
-}
-
-func make11(store adt.Store) (State, error) {
-	out := state11{store: store}
-	out.State = paych11.State{}
-	return &out, nil
-}
-
-type state11 struct {
-	paych11.State
-	store adt.Store
-	lsAmt *adt11.Array
-}
-
-// Channel owner, who has funded the actor
-func (s *state11) From() (address.Address, error) {
-	return s.State.From, nil
-}
-
-// Recipient of payouts from channel
-func (s *state11) To() (address.Address, error) {
-	return s.State.To, nil
-}
-
-// Height at which the channel can be `Collected`
-func (s *state11) SettlingAt() (abi.ChainEpoch, error) {
-	return s.State.SettlingAt, nil
-}
-
-// Amount successfully redeemed through the payment channel, paid out on `Collect()`
-func (s *state11) ToSend() (abi.TokenAmount, error) {
-	return s.State.ToSend, nil
-}
-
-func (s *state11) getOrLoadLsAmt() (*adt11.Array, error) {
-	if s.lsAmt != nil {
-		return s.lsAmt, nil
-	}
-
-	// Get the lane state from the chain
-	lsamt, err := adt11.AsArray(s.store, s.State.LaneStates, paych11.LaneStatesAmtBitwidth)
-	if err != nil {
-		return nil, err
-	}
-
-	s.lsAmt = lsamt
-	return lsamt, nil
-}
-
-// Get total number of lanes
-func (s *state11) LaneCount() (uint64, error) {
-	lsamt, err := s.getOrLoadLsAmt()
-	if err != nil {
-		return 0, err
-	}
-	return lsamt.Length(), nil
-}
-
-func (s *state11) GetState() interface{} {
-	return &s.State
-}
-
-// Iterate lane states
-func (s *state11) ForEachLaneState(cb func(idx uint64, dl LaneState) error) error {
-	// Get the lane state from the chain
-	lsamt, err := s.getOrLoadLsAmt()
-	if err != nil {
-		return err
-	}
-
-	// Note: we use a map instead of an array to store laneStates because the
-	// client sets the lane ID (the index) and potentially they could use a
-	// very large index.
-	var ls paych11.LaneState
-	return lsamt.ForEach(&ls, func(i int64) error {
-		return cb(uint64(i), &laneState11{ls})
-	})
-}
-
-type laneState11 struct {
-	paych11.LaneState
-}
-
-func (ls *laneState11) Redeemed() (big.Int, error) {
-	return ls.LaneState.Redeemed, nil
-}
-
-func (ls *laneState11) Nonce() (uint64, error) {
-	return ls.LaneState.Nonce, nil
-}
-
-func (s *state11) ActorKey() string {
-	return manifest.PaychKey
-}
-
-func (s *state11) ActorVersion() actorstypes.Version {
-	return actorstypes.Version11
-}
-
-func (s *state11) Code() cid.Cid {
-	code, ok := actors.GetActorCodeID(s.ActorVersion(), s.ActorKey())
-	if !ok {
-		panic(fmt.Errorf("didn't find actor %v code id for actor version %d", s.ActorKey(), s.ActorVersion()))
-	}
-
-	return code
-}
@@ -9,7 +9,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/big"
-	builtin11 "github.com/filecoin-project/go-state-types/builtin"
+	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"
@@ -27,8 +27,8 @@ import (
 )

 var (
-	Address = builtin11.StoragePowerActorAddr
-	Methods = builtin11.MethodsPower
+	Address = builtin10.StoragePowerActorAddr
+	Methods = builtin10.MethodsPower
 )

 func Load(store adt.Store, act *types.Actor) (State, error) {
@@ -48,9 +48,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version10:
 			return load10(store, act.Head)

-		case actorstypes.Version11:
-			return load11(store, act.Head)
-
 		}
 	}

@@ -115,9 +112,6 @@ func MakeState(store adt.Store, av actorstypes.Version) (State, error) {
 	case actorstypes.Version10:
 		return make10(store)

-	case actorstypes.Version11:
-		return make11(store)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -182,6 +176,5 @@ func AllCodes() []cid.Cid {
 		(&state8{}).Code(),
 		(&state9{}).Code(),
 		(&state10{}).Code(),
-		(&state11{}).Code(),
 	}
 }
@@ -1,207 +0,0 @@
-package power
-
-import (
-	"bytes"
-	"fmt"
-
-	"github.com/ipfs/go-cid"
-	cbg "github.com/whyrusleeping/cbor-gen"
-
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtin11 "github.com/filecoin-project/go-state-types/builtin"
-	power11 "github.com/filecoin-project/go-state-types/builtin/v11/power"
-	adt11 "github.com/filecoin-project/go-state-types/builtin/v11/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"
-	"github.com/filecoin-project/lotus/chain/actors/builtin"
-)
-
-var _ State = (*state11)(nil)
-
-func load11(store adt.Store, root cid.Cid) (State, error) {
-	out := state11{store: store}
-	err := store.Get(store.Context(), root, &out)
-	if err != nil {
-		return nil, err
-	}
-	return &out, nil
-}
-
-func make11(store adt.Store) (State, error) {
-	out := state11{store: store}
-
-	s, err := power11.ConstructState(store)
-	if err != nil {
-		return nil, err
-	}
-
-	out.State = *s
-
-	return &out, nil
-}
-
-type state11 struct {
-	power11.State
-	store adt.Store
-}
-
-func (s *state11) TotalLocked() (abi.TokenAmount, error) {
-	return s.TotalPledgeCollateral, nil
-}
-
-func (s *state11) TotalPower() (Claim, error) {
-	return Claim{
-		RawBytePower:    s.TotalRawBytePower,
-		QualityAdjPower: s.TotalQualityAdjPower,
-	}, nil
-}
-
-// Committed power to the network. Includes miners below the minimum threshold.
-func (s *state11) TotalCommitted() (Claim, error) {
-	return Claim{
-		RawBytePower:    s.TotalBytesCommitted,
-		QualityAdjPower: s.TotalQABytesCommitted,
-	}, nil
-}
-
-func (s *state11) MinerPower(addr address.Address) (Claim, bool, error) {
-	claims, err := s.claims()
-	if err != nil {
-		return Claim{}, false, err
-	}
-	var claim power11.Claim
-	ok, err := claims.Get(abi.AddrKey(addr), &claim)
-	if err != nil {
-		return Claim{}, false, err
-	}
-	return Claim{
-		RawBytePower:    claim.RawBytePower,
-		QualityAdjPower: claim.QualityAdjPower,
-	}, ok, nil
-}
-
-func (s *state11) MinerNominalPowerMeetsConsensusMinimum(a address.Address) (bool, error) {
-	return s.State.MinerNominalPowerMeetsConsensusMinimum(s.store, a)
-}
-
-func (s *state11) TotalPowerSmoothed() (builtin.FilterEstimate, error) {
-	return builtin.FilterEstimate(s.State.ThisEpochQAPowerSmoothed), nil
-}
-
-func (s *state11) MinerCounts() (uint64, uint64, error) {
-	return uint64(s.State.MinerAboveMinPowerCount), uint64(s.State.MinerCount), nil
-}
-
-func (s *state11) ListAllMiners() ([]address.Address, error) {
-	claims, err := s.claims()
-	if err != nil {
-		return nil, err
-	}
-
-	var miners []address.Address
-	err = claims.ForEach(nil, func(k string) error {
-		a, err := address.NewFromBytes([]byte(k))
-		if err != nil {
-			return err
-		}
-		miners = append(miners, a)
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return miners, nil
-}
-
-func (s *state11) ForEachClaim(cb func(miner address.Address, claim Claim) error) error {
-	claims, err := s.claims()
-	if err != nil {
-		return err
-	}
-
-	var claim power11.Claim
-	return claims.ForEach(&claim, func(k string) error {
-		a, err := address.NewFromBytes([]byte(k))
-		if err != nil {
-			return err
-		}
-		return cb(a, Claim{
-			RawBytePower:    claim.RawBytePower,
-			QualityAdjPower: claim.QualityAdjPower,
-		})
-	})
-}
-
-func (s *state11) ClaimsChanged(other State) (bool, error) {
-	other11, ok := other.(*state11)
-	if !ok {
-		// treat an upgrade as a change, always
-		return true, nil
-	}
-	return !s.State.Claims.Equals(other11.State.Claims), nil
-}
-
-func (s *state11) SetTotalQualityAdjPower(p abi.StoragePower) error {
-	s.State.TotalQualityAdjPower = p
-	return nil
-}
-
-func (s *state11) SetTotalRawBytePower(p abi.StoragePower) error {
-	s.State.TotalRawBytePower = p
-	return nil
-}
-
-func (s *state11) SetThisEpochQualityAdjPower(p abi.StoragePower) error {
-	s.State.ThisEpochQualityAdjPower = p
-	return nil
-}
-
-func (s *state11) SetThisEpochRawBytePower(p abi.StoragePower) error {
-	s.State.ThisEpochRawBytePower = p
-	return nil
-}
-
-func (s *state11) GetState() interface{} {
-	return &s.State
-}
-
-func (s *state11) claims() (adt.Map, error) {
-	return adt11.AsMap(s.store, s.Claims, builtin11.DefaultHamtBitwidth)
-}
-
-func (s *state11) decodeClaim(val *cbg.Deferred) (Claim, error) {
-	var ci power11.Claim
-	if err := ci.UnmarshalCBOR(bytes.NewReader(val.Raw)); err != nil {
-		return Claim{}, err
-	}
-	return fromV11Claim(ci), nil
-}
-
-func fromV11Claim(v11 power11.Claim) Claim {
-	return Claim{
-		RawBytePower:    v11.RawBytePower,
-		QualityAdjPower: v11.QualityAdjPower,
-	}
-}
-
-func (s *state11) ActorKey() string {
-	return manifest.PowerKey
-}
-
-func (s *state11) ActorVersion() actorstypes.Version {
-	return actorstypes.Version11
-}
-
-func (s *state11) Code() cid.Cid {
-	code, ok := actors.GetActorCodeID(s.ActorVersion(), s.ActorKey())
-	if !ok {
-		panic(fmt.Errorf("didn't find actor %v code id for actor version %d", s.ActorKey(), s.ActorVersion()))
-	}
-
-	return code
-}
@@ -26,22 +26,6 @@ import (
 	reward10 "github.com/filecoin-project/go-state-types/builtin/v10/reward"
 	system10 "github.com/filecoin-project/go-state-types/builtin/v10/system"
 	verifreg10 "github.com/filecoin-project/go-state-types/builtin/v10/verifreg"
-	account11 "github.com/filecoin-project/go-state-types/builtin/v11/account"
-	cron11 "github.com/filecoin-project/go-state-types/builtin/v11/cron"
-	datacap11 "github.com/filecoin-project/go-state-types/builtin/v11/datacap"
-	eam11 "github.com/filecoin-project/go-state-types/builtin/v11/eam"
-	ethaccount11 "github.com/filecoin-project/go-state-types/builtin/v11/ethaccount"
-	evm11 "github.com/filecoin-project/go-state-types/builtin/v11/evm"
-	_init11 "github.com/filecoin-project/go-state-types/builtin/v11/init"
-	market11 "github.com/filecoin-project/go-state-types/builtin/v11/market"
-	miner11 "github.com/filecoin-project/go-state-types/builtin/v11/miner"
-	multisig11 "github.com/filecoin-project/go-state-types/builtin/v11/multisig"
-	paych11 "github.com/filecoin-project/go-state-types/builtin/v11/paych"
-	placeholder11 "github.com/filecoin-project/go-state-types/builtin/v11/placeholder"
-	power11 "github.com/filecoin-project/go-state-types/builtin/v11/power"
-	reward11 "github.com/filecoin-project/go-state-types/builtin/v11/reward"
-	system11 "github.com/filecoin-project/go-state-types/builtin/v11/system"
-	verifreg11 "github.com/filecoin-project/go-state-types/builtin/v11/verifreg"
 	account8 "github.com/filecoin-project/go-state-types/builtin/v8/account"
 	cron8 "github.com/filecoin-project/go-state-types/builtin/v8/cron"
 	_init8 "github.com/filecoin-project/go-state-types/builtin/v8/init"
@@ -393,110 +377,6 @@ func MakeRegistry(av actorstypes.Version) []RegistryEntry {
 			}
 		}

-	case actorstypes.Version11:
-		for key, codeID := range codeIDs {
-			switch key {
-			case manifest.AccountKey:
-				registry = append(registry, RegistryEntry{
-					code:    codeID,
-					methods: account11.Methods,
-					state:   new(account11.State),
-				})
-			case manifest.CronKey:
-				registry = append(registry, RegistryEntry{
-					code:    codeID,
-					methods: cron11.Methods,
-					state:   new(cron11.State),
-				})
-			case manifest.InitKey:
-				registry = append(registry, RegistryEntry{
-					code:    codeID,
-					methods: _init11.Methods,
-					state:   new(_init11.State),
-				})
-			case manifest.MarketKey:
-				registry = append(registry, RegistryEntry{
-					code:    codeID,
-					methods: market11.Methods,
-					state:   new(market11.State),
-				})
-			case manifest.MinerKey:
-				registry = append(registry, RegistryEntry{
-					code:    codeID,
-					methods: miner11.Methods,
-					state:   new(miner11.State),
-				})
-			case manifest.MultisigKey:
-				registry = append(registry, RegistryEntry{
-					code:    codeID,
-					methods: multisig11.Methods,
-					state:   new(multisig11.State),
-				})
-			case manifest.PaychKey:
-				registry = append(registry, RegistryEntry{
-					code:    codeID,
-					methods: paych11.Methods,
-					state:   new(paych11.State),
-				})
-			case manifest.PowerKey:
-				registry = append(registry, RegistryEntry{
-					code:    codeID,
-					methods: power11.Methods,
-					state:   new(power11.State),
-				})
-			case manifest.RewardKey:
-				registry = append(registry, RegistryEntry{
-					code:    codeID,
-					methods: reward11.Methods,
-					state:   new(reward11.State),
-				})
-			case manifest.SystemKey:
-				registry = append(registry, RegistryEntry{
-					code:    codeID,
-					methods: system11.Methods,
-					state:   new(system11.State),
-				})
-			case manifest.VerifregKey:
-				registry = append(registry, RegistryEntry{
-					code:    codeID,
-					methods: verifreg11.Methods,
-					state:   new(verifreg11.State),
-				})
-			case manifest.DatacapKey:
-				registry = append(registry, RegistryEntry{
-					code:    codeID,
-					methods: datacap11.Methods,
-					state:   new(datacap11.State),
-				})
-
-			case manifest.EvmKey:
-				registry = append(registry, RegistryEntry{
-					code:    codeID,
-					methods: evm11.Methods,
-					state:   new(evm11.State),
-				})
-			case manifest.EamKey:
-				registry = append(registry, RegistryEntry{
-					code:    codeID,
-					methods: eam11.Methods,
-					state:   nil,
-				})
-			case manifest.PlaceholderKey:
-				registry = append(registry, RegistryEntry{
-					code:    codeID,
-					methods: placeholder11.Methods,
-					state:   nil,
-				})
-			case manifest.EthAccountKey:
-				registry = append(registry, RegistryEntry{
-					code:    codeID,
-					methods: ethaccount11.Methods,
-					state:   nil,
-				})
-
-			}
-		}
-
 	default:
 		panic("expected version v8 and up only, use specs-actors for v0-7")
 	}
@@ -6,7 +6,7 @@ import (

 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtin11 "github.com/filecoin-project/go-state-types/builtin"
+	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"
@@ -25,8 +25,8 @@ import (
 )

 var (
-	Address = builtin11.RewardActorAddr
-	Methods = builtin11.MethodsReward
+	Address = builtin10.RewardActorAddr
+	Methods = builtin10.MethodsReward
 )

 func Load(store adt.Store, act *types.Actor) (State, error) {
@@ -46,9 +46,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version10:
 			return load10(store, act.Head)

-		case actorstypes.Version11:
-			return load11(store, act.Head)
-
 		}
 	}

@@ -113,9 +110,6 @@ func MakeState(store adt.Store, av actorstypes.Version, currRealizedPower abi.St
 	case actorstypes.Version10:
 		return make10(store, currRealizedPower)

-	case actorstypes.Version11:
-		return make11(store, currRealizedPower)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -158,6 +152,5 @@ func AllCodes() []cid.Cid {
 		(&state8{}).Code(),
 		(&state9{}).Code(),
 		(&state10{}).Code(),
-		(&state11{}).Code(),
 	}
 }
@@ -1,120 +0,0 @@
-package reward
-
-import (
-	"fmt"
-
-	"github.com/ipfs/go-cid"
-
-	"github.com/filecoin-project/go-state-types/abi"
-	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	miner11 "github.com/filecoin-project/go-state-types/builtin/v11/miner"
-	reward11 "github.com/filecoin-project/go-state-types/builtin/v11/reward"
-	smoothing11 "github.com/filecoin-project/go-state-types/builtin/v11/util/smoothing"
-	"github.com/filecoin-project/go-state-types/manifest"
-
-	"github.com/filecoin-project/lotus/chain/actors"
-	"github.com/filecoin-project/lotus/chain/actors/adt"
-	"github.com/filecoin-project/lotus/chain/actors/builtin"
-)
-
-var _ State = (*state11)(nil)
-
-func load11(store adt.Store, root cid.Cid) (State, error) {
-	out := state11{store: store}
-	err := store.Get(store.Context(), root, &out)
-	if err != nil {
-		return nil, err
-	}
-	return &out, nil
-}
-
-func make11(store adt.Store, currRealizedPower abi.StoragePower) (State, error) {
-	out := state11{store: store}
-	out.State = *reward11.ConstructState(currRealizedPower)
-	return &out, nil
-}
-
-type state11 struct {
-	reward11.State
-	store adt.Store
-}
-
-func (s *state11) ThisEpochReward() (abi.TokenAmount, error) {
-	return s.State.ThisEpochReward, nil
-}
-
-func (s *state11) ThisEpochRewardSmoothed() (builtin.FilterEstimate, error) {
-
-	return builtin.FilterEstimate{
-		PositionEstimate: s.State.ThisEpochRewardSmoothed.PositionEstimate,
-		VelocityEstimate: s.State.ThisEpochRewardSmoothed.VelocityEstimate,
-	}, nil
-
-}
-
-func (s *state11) ThisEpochBaselinePower() (abi.StoragePower, error) {
-	return s.State.ThisEpochBaselinePower, nil
-}
-
-func (s *state11) TotalStoragePowerReward() (abi.TokenAmount, error) {
-	return s.State.TotalStoragePowerReward, nil
-}
-
-func (s *state11) EffectiveBaselinePower() (abi.StoragePower, error) {
-	return s.State.EffectiveBaselinePower, nil
-}
-
-func (s *state11) EffectiveNetworkTime() (abi.ChainEpoch, error) {
-	return s.State.EffectiveNetworkTime, nil
-}
-
-func (s *state11) CumsumBaseline() (reward11.Spacetime, error) {
-	return s.State.CumsumBaseline, nil
-}
-
-func (s *state11) CumsumRealized() (reward11.Spacetime, error) {
-	return s.State.CumsumRealized, nil
-}
-
-func (s *state11) InitialPledgeForPower(qaPower abi.StoragePower, networkTotalPledge abi.TokenAmount, networkQAPower *builtin.FilterEstimate, circSupply abi.TokenAmount) (abi.TokenAmount, error) {
-	return miner11.InitialPledgeForPower(
-		qaPower,
-		s.State.ThisEpochBaselinePower,
-		s.State.ThisEpochRewardSmoothed,
-		smoothing11.FilterEstimate{
-			PositionEstimate: networkQAPower.PositionEstimate,
-			VelocityEstimate: networkQAPower.VelocityEstimate,
-		},
-		circSupply,
-	), nil
-}
-
-func (s *state11) PreCommitDepositForPower(networkQAPower builtin.FilterEstimate, sectorWeight abi.StoragePower) (abi.TokenAmount, error) {
-	return miner11.PreCommitDepositForPower(s.State.ThisEpochRewardSmoothed,
-		smoothing11.FilterEstimate{
-			PositionEstimate: networkQAPower.PositionEstimate,
-			VelocityEstimate: networkQAPower.VelocityEstimate,
-		},
-		sectorWeight), nil
-}
-
-func (s *state11) GetState() interface{} {
-	return &s.State
-}
-
-func (s *state11) ActorKey() string {
-	return manifest.RewardKey
-}
-
-func (s *state11) ActorVersion() actorstypes.Version {
-	return actorstypes.Version11
-}
-
-func (s *state11) Code() cid.Cid {
-	code, ok := actors.GetActorCodeID(s.ActorVersion(), s.ActorKey())
-	if !ok {
-		panic(fmt.Errorf("didn't find actor %v code id for actor version %d", s.ActorKey(), s.ActorVersion()))
-	}
-
-	return code
-}
@@ -5,7 +5,7 @@ import (
 	"golang.org/x/xerrors"

 	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtin11 "github.com/filecoin-project/go-state-types/builtin"
+	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"
@@ -21,7 +21,7 @@ import (
 )

 var (
-	Address = builtin11.SystemActorAddr
+	Address = builtin10.SystemActorAddr
 )

 func Load(store adt.Store, act *types.Actor) (State, error) {
@@ -41,9 +41,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version10:
 			return load10(store, act.Head)

-		case actorstypes.Version11:
-			return load11(store, act.Head)
-
 		}
 	}

@@ -108,9 +105,6 @@ func MakeState(store adt.Store, av actorstypes.Version, builtinActors cid.Cid) (
 	case actorstypes.Version10:
 		return make10(store, builtinActors)

-	case actorstypes.Version11:
-		return make11(store, builtinActors)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -137,6 +131,5 @@ func AllCodes() []cid.Cid {
 		(&state8{}).Code(),
 		(&state9{}).Code(),
 		(&state10{}).Code(),
-		(&state11{}).Code(),
 	}
 }
@@ -1,72 +0,0 @@
-package system
-
-import (
-	"fmt"
-
-	"github.com/ipfs/go-cid"
-
-	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	system11 "github.com/filecoin-project/go-state-types/builtin/v11/system"
-	"github.com/filecoin-project/go-state-types/manifest"
-
-	"github.com/filecoin-project/lotus/chain/actors"
-	"github.com/filecoin-project/lotus/chain/actors/adt"
-)
-
-var _ State = (*state11)(nil)
-
-func load11(store adt.Store, root cid.Cid) (State, error) {
-	out := state11{store: store}
-	err := store.Get(store.Context(), root, &out)
-	if err != nil {
-		return nil, err
-	}
-	return &out, nil
-}
-
-func make11(store adt.Store, builtinActors cid.Cid) (State, error) {
-	out := state11{store: store}
-	out.State = system11.State{
-		BuiltinActors: builtinActors,
-	}
-	return &out, nil
-}
-
-type state11 struct {
-	system11.State
-	store adt.Store
-}
-
-func (s *state11) GetState() interface{} {
-	return &s.State
-}
-
-func (s *state11) GetBuiltinActors() cid.Cid {
-
-	return s.State.BuiltinActors
-
-}
-
-func (s *state11) SetBuiltinActors(c cid.Cid) error {
-
-	s.State.BuiltinActors = c
-	return nil
-
-}
-
-func (s *state11) ActorKey() string {
-	return manifest.SystemKey
-}
-
-func (s *state11) ActorVersion() actorstypes.Version {
-	return actorstypes.Version11
-}
-
-func (s *state11) Code() cid.Cid {
-	code, ok := actors.GetActorCodeID(s.ActorVersion(), s.ActorKey())
-	if !ok {
-		panic(fmt.Errorf("didn't find actor %v code id for actor version %d", s.ActorKey(), s.ActorVersion()))
-	}
-
-	return code
-}
@@ -1,152 +0,0 @@
-package verifreg
-
-import (
-	"fmt"
-
-	"github.com/ipfs/go-cid"
-	"golang.org/x/xerrors"
-
-	"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/big"
-	builtin11 "github.com/filecoin-project/go-state-types/builtin"
-	adt11 "github.com/filecoin-project/go-state-types/builtin/v11/util/adt"
-	verifreg11 "github.com/filecoin-project/go-state-types/builtin/v11/verifreg"
-	verifreg9 "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"
-)
-
-var _ State = (*state11)(nil)
-
-func load11(store adt.Store, root cid.Cid) (State, error) {
-	out := state11{store: store}
-	err := store.Get(store.Context(), root, &out)
-	if err != nil {
-		return nil, err
-	}
-	return &out, nil
-}
-
-func make11(store adt.Store, rootKeyAddress address.Address) (State, error) {
-	out := state11{store: store}
-
-	s, err := verifreg11.ConstructState(store, rootKeyAddress)
-	if err != nil {
-		return nil, err
-	}
-
-	out.State = *s
-
-	return &out, nil
-}
-
-type state11 struct {
-	verifreg11.State
-	store adt.Store
-}
-
-func (s *state11) RootKey() (address.Address, error) {
-	return s.State.RootKey, nil
-}
-
-func (s *state11) VerifiedClientDataCap(addr address.Address) (bool, abi.StoragePower, error) {
-
-	return false, big.Zero(), xerrors.Errorf("unsupported in actors v11")
-
-}
-
-func (s *state11) VerifierDataCap(addr address.Address) (bool, abi.StoragePower, error) {
-	return getDataCap(s.store, actors.Version11, s.verifiers, addr)
-}
-
-func (s *state11) RemoveDataCapProposalID(verifier address.Address, client address.Address) (bool, uint64, error) {
-	return getRemoveDataCapProposalID(s.store, actors.Version11, s.removeDataCapProposalIDs, verifier, client)
-}
-
-func (s *state11) ForEachVerifier(cb func(addr address.Address, dcap abi.StoragePower) error) error {
-	return forEachCap(s.store, actors.Version11, s.verifiers, cb)
-}
-
-func (s *state11) ForEachClient(cb func(addr address.Address, dcap abi.StoragePower) error) error {
-
-	return xerrors.Errorf("unsupported in actors v11")
-
-}
-
-func (s *state11) verifiedClients() (adt.Map, error) {
-
-	return nil, xerrors.Errorf("unsupported in actors v11")
-
-}
-
-func (s *state11) verifiers() (adt.Map, error) {
-	return adt11.AsMap(s.store, s.Verifiers, builtin11.DefaultHamtBitwidth)
-}
-
-func (s *state11) removeDataCapProposalIDs() (adt.Map, error) {
-	return adt11.AsMap(s.store, s.RemoveDataCapProposalIDs, builtin11.DefaultHamtBitwidth)
-}
-
-func (s *state11) GetState() interface{} {
-	return &s.State
-}
-
-func (s *state11) GetAllocation(clientIdAddr address.Address, allocationId verifreg9.AllocationId) (*Allocation, bool, error) {
-
-	alloc, ok, err := s.FindAllocation(s.store, clientIdAddr, verifreg11.AllocationId(allocationId))
-	return (*Allocation)(alloc), ok, err
-}
-
-func (s *state11) GetAllocations(clientIdAddr address.Address) (map[AllocationId]Allocation, error) {
-
-	v11Map, err := s.LoadAllocationsToMap(s.store, clientIdAddr)
-
-	retMap := make(map[AllocationId]Allocation, len(v11Map))
-	for k, v := range v11Map {
-		retMap[AllocationId(k)] = Allocation(v)
-	}
-
-	return retMap, err
-
-}
-
-func (s *state11) GetClaim(providerIdAddr address.Address, claimId verifreg9.ClaimId) (*Claim, bool, error) {
-
-	claim, ok, err := s.FindClaim(s.store, providerIdAddr, verifreg11.ClaimId(claimId))
-	return (*Claim)(claim), ok, err
-
-}
-
-func (s *state11) GetClaims(providerIdAddr address.Address) (map[ClaimId]Claim, error) {
-
-	v11Map, err := s.LoadClaimsToMap(s.store, providerIdAddr)
-
-	retMap := make(map[ClaimId]Claim, len(v11Map))
-	for k, v := range v11Map {
-		retMap[ClaimId(k)] = Claim(v)
-	}
-
-	return retMap, err
-
-}
-
-func (s *state11) ActorKey() string {
-	return manifest.VerifregKey
-}
-
-func (s *state11) ActorVersion() actorstypes.Version {
-	return actorstypes.Version11
-}
-
-func (s *state11) Code() cid.Cid {
-	code, ok := actors.GetActorCodeID(s.ActorVersion(), s.ActorKey())
-	if !ok {
-		panic(fmt.Errorf("didn't find actor %v code id for actor version %d", s.ActorKey(), s.ActorVersion()))
-	}
-
-	return code
-}
@@ -7,7 +7,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"
-	builtin11 "github.com/filecoin-project/go-state-types/builtin"
+	builtin10 "github.com/filecoin-project/go-state-types/builtin"
 	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"
@@ -25,8 +25,8 @@ import (
 )

 var (
-	Address = builtin11.VerifiedRegistryActorAddr
-	Methods = builtin11.MethodsVerifiedRegistry
+	Address = builtin10.VerifiedRegistryActorAddr
+	Methods = builtin10.MethodsVerifiedRegistry
 )

 func Load(store adt.Store, act *types.Actor) (State, error) {
@@ -46,9 +46,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version10:
 			return load10(store, act.Head)

-		case actorstypes.Version11:
-			return load11(store, act.Head)
-
 		}
 	}

@@ -113,9 +110,6 @@ func MakeState(store adt.Store, av actorstypes.Version, rootKeyAddress address.A
 	case actorstypes.Version10:
 		return make10(store, rootKeyAddress)

-	case actorstypes.Version11:
-		return make11(store, rootKeyAddress)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -152,7 +146,6 @@ func AllCodes() []cid.Cid {
 		(&state8{}).Code(),
 		(&state9{}).Code(),
 		(&state10{}).Code(),
-		(&state11{}).Code(),
 	}
 }

@@ -7,16 +7,12 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/big"
 	builtin10 "github.com/filecoin-project/go-state-types/builtin"
-	builtin11 "github.com/filecoin-project/go-state-types/builtin"
 	builtin8 "github.com/filecoin-project/go-state-types/builtin"
 	builtin9 "github.com/filecoin-project/go-state-types/builtin"
 	market10 "github.com/filecoin-project/go-state-types/builtin/v10/market"
 	miner10 "github.com/filecoin-project/go-state-types/builtin/v10/miner"
+	paych10 "github.com/filecoin-project/go-state-types/builtin/v10/paych"
 	verifreg10 "github.com/filecoin-project/go-state-types/builtin/v10/verifreg"
-	market11 "github.com/filecoin-project/go-state-types/builtin/v11/market"
-	miner11 "github.com/filecoin-project/go-state-types/builtin/v11/miner"
-	paych11 "github.com/filecoin-project/go-state-types/builtin/v11/paych"
-	verifreg11 "github.com/filecoin-project/go-state-types/builtin/v11/verifreg"
 	market8 "github.com/filecoin-project/go-state-types/builtin/v8/market"
 	miner8 "github.com/filecoin-project/go-state-types/builtin/v8/miner"
 	verifreg8 "github.com/filecoin-project/go-state-types/builtin/v8/verifreg"
@@ -55,10 +51,10 @@ import (
 )

 const (
-	ChainFinality                  = miner11.ChainFinality
+	ChainFinality                  = miner10.ChainFinality
 	SealRandomnessLookback         = ChainFinality
-	PaychSettleDelay               = paych11.SettleDelay
-	MaxPreCommitRandomnessLookback = builtin11.EpochsInDay + SealRandomnessLookback
+	PaychSettleDelay               = paych10.SettleDelay
+	MaxPreCommitRandomnessLookback = builtin10.EpochsInDay + SealRandomnessLookback
 )

 // SetSupportedProofTypes sets supported proof types, across all actor versions.
@@ -169,13 +165,11 @@ func SetPreCommitChallengeDelay(delay abi.ChainEpoch) {

 	miner10.PreCommitChallengeDelay = delay

-	miner11.PreCommitChallengeDelay = delay
-
 }

 // TODO: this function shouldn't really exist. Instead, the API should expose the precommit delay.
 func GetPreCommitChallengeDelay() abi.ChainEpoch {
-	return miner11.PreCommitChallengeDelay
+	return miner10.PreCommitChallengeDelay
 }

 // SetConsensusMinerMinPower sets the minimum power of an individual miner must
@@ -221,10 +215,6 @@ func SetConsensusMinerMinPower(p abi.StoragePower) {
 		policy.ConsensusMinerMinPower = p
 	}

-	for _, policy := range builtin11.PoStProofPolicies {
-		policy.ConsensusMinerMinPower = p
-	}
-
 }

 // SetMinVerifiedDealSize sets the minimum size of a verified deal. This should
@@ -251,8 +241,6 @@ func SetMinVerifiedDealSize(size abi.StoragePower) {

 	verifreg10.MinVerifiedDealSize = size

-	verifreg11.MinVerifiedDealSize = size
-
 }

 func GetMaxProveCommitDuration(ver actorstypes.Version, t abi.RegisteredSealProof) (abi.ChainEpoch, error) {
@@ -298,10 +286,6 @@ func GetMaxProveCommitDuration(ver actorstypes.Version, t abi.RegisteredSealProo

 		return miner10.MaxProveCommitDuration[t], nil

-	case actorstypes.Version11:
-
-		return miner11.MaxProveCommitDuration[t], nil
-
 	default:
 		return 0, xerrors.Errorf("unsupported actors version")
 	}
@@ -357,11 +341,6 @@ func SetProviderCollateralSupplyTarget(num, denom big.Int) {
 		Denominator: denom,
 	}

-	market11.ProviderCollateralSupplyTarget = builtin11.BigFrac{
-		Numerator:   num,
-		Denominator: denom,
-	}
-
 }

 func DealProviderCollateralBounds(
@@ -425,18 +404,13 @@ func DealProviderCollateralBounds(
 		min, max := market10.DealProviderCollateralBounds(size, verified, rawBytePower, qaPower, baselinePower, circulatingFil)
 		return min, max, nil

-	case actorstypes.Version11:
-
-		min, max := market11.DealProviderCollateralBounds(size, verified, rawBytePower, qaPower, baselinePower, circulatingFil)
-		return min, max, nil
-
 	default:
 		return big.Zero(), big.Zero(), xerrors.Errorf("unsupported actors version")
 	}
 }

 func DealDurationBounds(pieceSize abi.PaddedPieceSize) (min, max abi.ChainEpoch) {
-	return market11.DealDurationBounds(pieceSize)
+	return market10.DealDurationBounds(pieceSize)
 }

 // Sets the challenge window and scales the proving period to match (such that
@@ -505,13 +479,6 @@ func SetWPoStChallengeWindow(period abi.ChainEpoch) {
 	// scale it if we're scaling the challenge period.
 	miner10.WPoStDisputeWindow = period * 30

-	miner11.WPoStChallengeWindow = period
-	miner11.WPoStProvingPeriod = period * abi.ChainEpoch(miner11.WPoStPeriodDeadlines)
-
-	// by default, this is 2x finality which is 30 periods.
-	// scale it if we're scaling the challenge period.
-	miner11.WPoStDisputeWindow = period * 30
-
 }

 func GetWinningPoStSectorSetLookback(nwVer network.Version) abi.ChainEpoch {
@@ -524,15 +491,15 @@ func GetWinningPoStSectorSetLookback(nwVer network.Version) abi.ChainEpoch {
 }

 func GetMaxSectorExpirationExtension() abi.ChainEpoch {
-	return miner11.MaxSectorExpirationExtension
+	return miner10.MaxSectorExpirationExtension
 }

 func GetMinSectorExpiration() abi.ChainEpoch {
-	return miner11.MinSectorExpiration
+	return miner10.MinSectorExpiration
 }

 func GetMaxPoStPartitions(nv network.Version, p abi.RegisteredPoStProof) (int, error) {
-	sectorsPerPart, err := builtin11.PoStProofWindowPoStPartitionSectors(p)
+	sectorsPerPart, err := builtin10.PoStProofWindowPoStPartitionSectors(p)
 	if err != nil {
 		return 0, err
 	}
@@ -552,7 +519,7 @@ func GetSectorMaxLifetime(proof abi.RegisteredSealProof, nwVer network.Version)
 		return builtin4.SealProofPoliciesV0[proof].SectorMaxLifetime
 	}

-	return builtin11.SealProofPoliciesV11[proof].SectorMaxLifetime
+	return builtin10.SealProofPoliciesV11[proof].SectorMaxLifetime
 }

 func GetAddressedSectorsMax(nwVer network.Version) (int, error) {
@@ -592,9 +559,6 @@ func GetAddressedSectorsMax(nwVer network.Version) (int, error) {
 	case actorstypes.Version10:
 		return miner10.AddressedSectorsMax, nil

-	case actorstypes.Version11:
-		return miner11.AddressedSectorsMax, nil
-
 	default:
 		return 0, xerrors.Errorf("unsupported network version")
 	}
@@ -648,10 +612,6 @@ func GetDeclarationsMax(nwVer network.Version) (int, error) {

 		return miner10.DeclarationsMax, nil

-	case actorstypes.Version11:
-
-		return miner11.DeclarationsMax, nil
-
 	default:
 		return 0, xerrors.Errorf("unsupported network version")
 	}
@@ -704,10 +664,6 @@ func AggregateProveCommitNetworkFee(nwVer network.Version, aggregateSize int, ba

 		return miner10.AggregateProveCommitNetworkFee(aggregateSize, baseFee), nil

-	case actorstypes.Version11:
-
-		return miner11.AggregateProveCommitNetworkFee(aggregateSize, baseFee), nil
-
 	default:
 		return big.Zero(), xerrors.Errorf("unsupported network version")
 	}
@@ -760,10 +716,6 @@ func AggregatePreCommitNetworkFee(nwVer network.Version, aggregateSize int, base

 		return miner10.AggregatePreCommitNetworkFee(aggregateSize, baseFee), nil

-	case actorstypes.Version11:
-
-		return miner11.AggregatePreCommitNetworkFee(aggregateSize, baseFee), nil
-
 	default:
 		return big.Zero(), xerrors.Errorf("unsupported network version")
 	}
@@ -14,9 +14,9 @@ const ({{range .actorVersions}}

 /* inline-gen start */

-var LatestVersion = 11
+var LatestVersion = 10

-var Versions = []int{0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}
+var Versions = []int{0, 2, 3, 4, 5, 6, 7, 8, 9, 10}

 const (
 	Version0  Version = 0
@@ -29,7 +29,6 @@ const (
 	Version8  Version = 8
 	Version9  Version = 9
 	Version10 Version = 10
-	Version11 Version = 11
 )

 /* inline-gen end */
@@ -51,7 +51,6 @@ func NewActorRegistry() *vm.ActorRegistry {
 	inv.Register(actorstypes.Version8, vm.ActorsVersionPredicate(actorstypes.Version8), builtin.MakeRegistry(actorstypes.Version8))
 	inv.Register(actorstypes.Version9, vm.ActorsVersionPredicate(actorstypes.Version9), builtin.MakeRegistry(actorstypes.Version9))
 	inv.Register(actorstypes.Version10, vm.ActorsVersionPredicate(actorstypes.Version10), builtin.MakeRegistry(actorstypes.Version10))
-	inv.Register(actorstypes.Version11, vm.ActorsVersionPredicate(actorstypes.Version11), builtin.MakeRegistry(actorstypes.Version11))

 	return inv
 }
@@ -19,7 +19,6 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/big"
 	nv18 "github.com/filecoin-project/go-state-types/builtin/v10/migration"
-	nv19 "github.com/filecoin-project/go-state-types/builtin/v11/migration"
 	nv17 "github.com/filecoin-project/go-state-types/builtin/v9/migration"
 	"github.com/filecoin-project/go-state-types/manifest"
 	"github.com/filecoin-project/go-state-types/migration"
@@ -246,21 +245,6 @@ func DefaultUpgradeSchedule() stmgr.UpgradeSchedule {
 			StopWithin:      5,
 		}},
 		Expensive: true,
-	}, {
-		Height:    build.UpgradeLightningHeight,
-		Network:   network.Version19,
-		Migration: UpgradeActorsV11,
-		PreMigrations: []stmgr.PreMigration{{
-			PreMigration:    PreUpgradeActorsV11,
-			StartWithin:     120,
-			DontStartWithin: 15,
-			StopWithin:      10,
-		}},
-		Expensive: true,
-	}, {
-		Height:    build.UpgradeThunderHeight,
-		Network:   network.Version20,
-		Migration: nil,
 	},
 	}

@@ -533,11 +517,12 @@ func UpgradeFaucetBurnRecovery(ctx context.Context, sm *stmgr.StateManager, _ st
 			MessageReceipt: *stmgr.MakeFakeRct(),
 			ActorErr:       nil,
 			ExecutionTrace: types.ExecutionTrace{
-				Msg: types.MessageTrace{
-					To:   fakeMsg.To,
-					From: fakeMsg.From,
-				},
-				Subcalls: subcalls,
+				Msg:        fakeMsg,
+				MsgRct:     stmgr.MakeFakeRct(),
+				Error:      "",
+				Duration:   0,
+				GasCharges: nil,
+				Subcalls:   subcalls,
 			},
 			Duration: 0,
 			GasCosts: nil,
@@ -710,11 +695,12 @@ func splitGenesisMultisig0(ctx context.Context, em stmgr.ExecMonitor, addr addre
 			MessageReceipt: *stmgr.MakeFakeRct(),
 			ActorErr:       nil,
 			ExecutionTrace: types.ExecutionTrace{
-				Msg: types.MessageTrace{
-					From: fakeMsg.From,
-					To:   fakeMsg.To,
-				},
-				Subcalls: subcalls,
+				Msg:        fakeMsg,
+				MsgRct:     stmgr.MakeFakeRct(),
+				Error:      "",
+				Duration:   0,
+				GasCharges: nil,
+				Subcalls:   subcalls,
 			},
 			Duration: 0,
 			GasCosts: nil,
@@ -1604,29 +1590,6 @@ func upgradeActorsV9Common(
 	return newRoot, nil
 }

-func PreUpgradeActorsV10(ctx context.Context, sm *stmgr.StateManager, cache stmgr.MigrationCache, root cid.Cid, epoch abi.ChainEpoch, ts *types.TipSet) error {
-	// Use half the CPUs for pre-migration, but leave at least 3.
-	workerCount := MigrationMaxWorkerCount
-	if workerCount <= 4 {
-		workerCount = 1
-	} else {
-		workerCount /= 2
-	}
-
-	lbts, lbRoot, err := stmgr.GetLookbackTipSetForRound(ctx, sm, ts, epoch)
-	if err != nil {
-		return xerrors.Errorf("error getting lookback ts for premigration: %w", err)
-	}
-
-	config := migration.Config{
-		MaxWorkers:        uint(workerCount),
-		ProgressLogPeriod: time.Minute * 5,
-	}
-
-	_, err = upgradeActorsV10Common(ctx, sm, cache, lbRoot, epoch, lbts, config)
-	return err
-}
-
 func UpgradeActorsV10(ctx context.Context, sm *stmgr.StateManager, cache stmgr.MigrationCache, cb stmgr.ExecMonitor,
 	root cid.Cid, epoch abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) {
 	// Use all the CPUs except 3.
@@ -1650,6 +1613,29 @@ func UpgradeActorsV10(ctx context.Context, sm *stmgr.StateManager, cache stmgr.M
 	return newRoot, nil
 }

+func PreUpgradeActorsV10(ctx context.Context, sm *stmgr.StateManager, cache stmgr.MigrationCache, root cid.Cid, epoch abi.ChainEpoch, ts *types.TipSet) error {
+	// Use half the CPUs for pre-migration, but leave at least 3.
+	workerCount := MigrationMaxWorkerCount
+	if workerCount <= 4 {
+		workerCount = 1
+	} else {
+		workerCount /= 2
+	}
+
+	lbts, lbRoot, err := stmgr.GetLookbackTipSetForRound(ctx, sm, ts, epoch)
+	if err != nil {
+		return xerrors.Errorf("error getting lookback ts for premigration: %w", err)
+	}
+
+	config := migration.Config{
+		MaxWorkers:        uint(workerCount),
+		ProgressLogPeriod: time.Minute * 5,
+	}
+
+	_, err = upgradeActorsV10Common(ctx, sm, cache, lbRoot, epoch, lbts, config)
+	return err
+}
+
 func upgradeActorsV10Common(
 	ctx context.Context, sm *stmgr.StateManager, cache stmgr.MigrationCache,
 	root cid.Cid, epoch abi.ChainEpoch, ts *types.TipSet,
@@ -1712,108 +1698,6 @@ func upgradeActorsV10Common(
 	return newRoot, nil
 }

-func PreUpgradeActorsV11(ctx context.Context, sm *stmgr.StateManager, cache stmgr.MigrationCache, root cid.Cid, epoch abi.ChainEpoch, ts *types.TipSet) error {
-	// Use half the CPUs for pre-migration, but leave at least 3.
-	workerCount := MigrationMaxWorkerCount
-	if workerCount <= 4 {
-		workerCount = 1
-	} else {
-		workerCount /= 2
-	}
-
-	lbts, lbRoot, err := stmgr.GetLookbackTipSetForRound(ctx, sm, ts, epoch)
-	if err != nil {
-		return xerrors.Errorf("error getting lookback ts for premigration: %w", err)
-	}
-
-	config := migration.Config{
-		MaxWorkers:        uint(workerCount),
-		ProgressLogPeriod: time.Minute * 5,
-	}
-
-	_, err = upgradeActorsV11Common(ctx, sm, cache, lbRoot, epoch, lbts, config)
-	return err
-}
-
-func UpgradeActorsV11(ctx context.Context, sm *stmgr.StateManager, cache stmgr.MigrationCache, cb stmgr.ExecMonitor,
-	root cid.Cid, epoch abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) {
-	// Use all the CPUs except 2.
-	workerCount := MigrationMaxWorkerCount - 3
-	if workerCount <= 0 {
-		workerCount = 1
-	}
-	config := migration.Config{
-		MaxWorkers:        uint(workerCount),
-		JobQueueSize:      1000,
-		ResultQueueSize:   100,
-		ProgressLogPeriod: 10 * time.Second,
-	}
-	newRoot, err := upgradeActorsV11Common(ctx, sm, cache, root, epoch, ts, config)
-	if err != nil {
-		return cid.Undef, xerrors.Errorf("migrating actors v11 state: %w", err)
-	}
-	return newRoot, nil
-}
-
-func upgradeActorsV11Common(
-	ctx context.Context, sm *stmgr.StateManager, cache stmgr.MigrationCache,
-	root cid.Cid, epoch abi.ChainEpoch, ts *types.TipSet,
-	config migration.Config,
-) (cid.Cid, error) {
-	writeStore := blockstore.NewAutobatch(ctx, sm.ChainStore().StateBlockstore(), units.GiB/4)
-	adtStore := store.ActorStore(ctx, writeStore)
-	// ensure that the manifest is loaded in the blockstore
-	if err := bundle.LoadBundles(ctx, writeStore, actorstypes.Version11); err != nil {
-		return cid.Undef, xerrors.Errorf("failed to load manifest bundle: %w", err)
-	}
-
-	// Load the state root.
-	var stateRoot types.StateRoot
-	if err := adtStore.Get(ctx, root, &stateRoot); err != nil {
-		return cid.Undef, xerrors.Errorf("failed to decode state root: %w", err)
-	}
-
-	if stateRoot.Version != types.StateTreeVersion5 {
-		return cid.Undef, xerrors.Errorf(
-			"expected state root version 5 for actors v11 upgrade, got %d",
-			stateRoot.Version,
-		)
-	}
-
-	manifest, ok := actors.GetManifest(actorstypes.Version11)
-	if !ok {
-		return cid.Undef, xerrors.Errorf("no manifest CID for v11 upgrade")
-	}
-
-	// Perform the migration
-	newHamtRoot, err := nv19.MigrateStateTree(ctx, adtStore, manifest, stateRoot.Actors, epoch, config,
-		migrationLogger{}, cache)
-	if err != nil {
-		return cid.Undef, xerrors.Errorf("upgrading to actors v11: %w", err)
-	}
-
-	// Persist the result.
-	newRoot, err := adtStore.Put(ctx, &types.StateRoot{
-		Version: types.StateTreeVersion5,
-		Actors:  newHamtRoot,
-		Info:    stateRoot.Info,
-	})
-	if err != nil {
-		return cid.Undef, xerrors.Errorf("failed to persist new state root: %w", err)
-	}
-
-	// Persists the new tree and shuts down the flush worker
-	if err := writeStore.Flush(ctx); err != nil {
-		return cid.Undef, xerrors.Errorf("writeStore flush failed: %w", err)
-	}
-
-	if err := writeStore.Shutdown(ctx); err != nil {
-		return cid.Undef, xerrors.Errorf("writeStore shutdown failed: %w", err)
-	}
-
-	return newRoot, nil
-}
-
 // Example upgrade function if upgrade requires only code changes
 //func UpgradeActorsV9(ctx context.Context, sm *stmgr.StateManager, _ stmgr.MigrationCache, _ stmgr.ExecMonitor, root cid.Cid, _ abi.ChainEpoch, _ *types.TipSet) (cid.Cid, error) {
 //	buf := blockstore.NewTieredBstore(sm.ChainStore().StateBlockstore(), blockstore.NewMemorySync())
@@ -17,7 +17,6 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/big"
 	builtintypes "github.com/filecoin-project/go-state-types/builtin"
-	power11 "github.com/filecoin-project/go-state-types/builtin/v11/power"
 	minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner"
 	markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market"
 	miner9 "github.com/filecoin-project/go-state-types/builtin/v9/miner"
@@ -28,7 +27,6 @@ import (
 	miner0 "github.com/filecoin-project/specs-actors/actors/builtin/miner"
 	power0 "github.com/filecoin-project/specs-actors/actors/builtin/power"
 	reward0 "github.com/filecoin-project/specs-actors/actors/builtin/reward"
-	power2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/power"
 	reward2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/reward"
 	power4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/power"
 	reward4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/reward"
@@ -137,32 +135,14 @@ func SetupStorageMiners(ctx context.Context, cs *store.ChainStore, sys vm.Syscal
 		}

 		{
-			var params []byte
-			if nv <= network.Version10 {
-				constructorParams := &power2.CreateMinerParams{
-					Owner:         m.Worker,
-					Worker:        m.Worker,
-					Peer:          []byte(m.PeerId),
-					SealProofType: spt,
-				}
-
-				params = mustEnc(constructorParams)
-			} else {
-				ppt, err := spt.RegisteredWindowPoStProofByNetworkVersion(nv)
-				if err != nil {
-					return cid.Undef, xerrors.Errorf("failed to convert spt to wpt: %w", err)
-				}
-
-				constructorParams := &power11.CreateMinerParams{
-					Owner:               m.Worker,
-					Worker:              m.Worker,
-					Peer:                []byte(m.PeerId),
-					WindowPoStProofType: ppt,
-				}
-
-				params = mustEnc(constructorParams)
+			constructorParams := &power0.CreateMinerParams{
+				Owner:         m.Worker,
+				Worker:        m.Worker,
+				Peer:          []byte(m.PeerId),
+				SealProofType: spt,
 			}

+			params := mustEnc(constructorParams)
 			rval, err := doExecValue(ctx, genesisVm, power.Address, m.Owner, m.PowerBalance, power.Methods.CreateMiner, params)
 			if err != nil {
 				return cid.Undef, xerrors.Errorf("failed to create genesis miner: %w", err)
@@ -156,7 +156,7 @@ func VersionForNetwork(ver network.Version) (types.StateTreeVersion, error) {
 	case network.Version13, network.Version14, network.Version15, network.Version16, network.Version17:
 		return types.StateTreeVersion4, nil

-	case network.Version18, network.Version19, network.Version20:
+	case network.Version18:
 		return types.StateTreeVersion5, nil

 	default:
@@ -8,6 +8,7 @@ import (
 	"go.opencensus.io/trace"

 	"github.com/filecoin-project/lotus/api"
+	"github.com/filecoin-project/lotus/chain/store"
 	"github.com/filecoin-project/lotus/chain/types"
 )

@@ -52,6 +53,12 @@ func (sm *StateManager) TipSetState(ctx context.Context, ts *types.TipSet) (st c

 	sm.stlk.Unlock()

+	// First, try to find the tipset in the current chain. If found, we can avoid re-executing
+	// it.
+	if st, rec, found := tryLookupTipsetState(ctx, sm.cs, ts); found {
+		return st, rec, nil
+	}
+
 	st, rec, err = sm.tsExec.ExecuteTipSet(ctx, sm, ts, sm.tsExecMonitor, false)
 	if err != nil {
 		return cid.Undef, cid.Undef, err
@@ -60,6 +67,51 @@ func (sm *StateManager) TipSetState(ctx context.Context, ts *types.TipSet) (st c
 	return st, rec, nil
 }

+// Try to lookup a state & receipt CID for a given tipset by walking the chain instead of executing
+// it. This will only successfully return the state/receipt CIDs if they're found in the state
+// store.
+//
+// NOTE: This _won't_ recursively walk the receipt/state trees. It assumes that having the root
+// implies having the rest of the tree. However, lotus generally makes that assumption anyways.
+func tryLookupTipsetState(ctx context.Context, cs *store.ChainStore, ts *types.TipSet) (cid.Cid, cid.Cid, bool) {
+	nextTs, err := cs.GetTipsetByHeight(ctx, ts.Height()+1, nil, false)
+	if err != nil {
+		// Nothing to see here. The requested height may be beyond the current head.
+		return cid.Undef, cid.Undef, false
+	}
+
+	// Make sure we're on the correct fork.
+	if nextTs.Parents() != ts.Key() {
+		// Also nothing to see here. This just means that the requested tipset is on a
+		// different fork.
+		return cid.Undef, cid.Undef, false
+	}
+
+	stateCid := nextTs.ParentState()
+	receiptCid := nextTs.ParentMessageReceipts()
+
+	// Make sure we have the parent state.
+	if hasState, err := cs.StateBlockstore().Has(ctx, stateCid); err != nil {
+		log.Errorw("failed to lookup state-root in blockstore", "cid", stateCid, "error", err)
+		return cid.Undef, cid.Undef, false
+	} else if !hasState {
+		// We have the chain but don't have the state. It looks like we need to try
+		// executing?
+		return cid.Undef, cid.Undef, false
+	}
+
+	// Make sure we have the receipts.
+	if hasReceipts, err := cs.ChainBlockstore().Has(ctx, receiptCid); err != nil {
+		log.Errorw("failed to lookup receipts in blockstore", "cid", receiptCid, "error", err)
+		return cid.Undef, cid.Undef, false
+	} else if !hasReceipts {
+		// If we don't have the receipts, re-execute and try again.
+		return cid.Undef, cid.Undef, false
+	}
+
+	return stateCid, receiptCid, true
+}
+
 func (sm *StateManager) ExecutionTraceWithMonitor(ctx context.Context, ts *types.TipSet, em ExecMonitor) (cid.Cid, error) {
 	st, _, err := sm.tsExec.ExecuteTipSet(ctx, sm, ts, em, true)
 	return st, err
@@ -347,11 +347,12 @@ func DoTransfer(tree types.StateTree, from, to address.Address, amt abi.TokenAmo
 		// record the transfer in execution traces

 		cb(types.ExecutionTrace{
-			Msg: types.MessageTrace{
-				From:  from,
-				To:    to,
-				Value: amt,
-			},
+			Msg:        MakeFakeMsg(from, to, amt, 0),
+			MsgRct:     MakeFakeRct(),
+			Error:      "",
+			Duration:   0,
+			GasCharges: nil,
+			Subcalls:   nil,
 		})
 	}

@@ -237,6 +237,26 @@ func (cs *ChainStore) ReadMsgMetaCids(ctx context.Context, mmc cid.Cid) ([]cid.C
 	return blscids, secpkcids, nil
 }

+func (cs *ChainStore) ReadReceipts(ctx context.Context, root cid.Cid) ([]types.MessageReceipt, error) {
+	a, err := blockadt.AsArray(cs.ActorStore(ctx), root)
+	if err != nil {
+		return nil, err
+	}
+
+	receipts := make([]types.MessageReceipt, 0, a.Length())
+	var rcpt types.MessageReceipt
+	if err := a.ForEach(&rcpt, func(i int64) error {
+		if int64(len(receipts)) != i {
+			return xerrors.Errorf("missing receipt %d", i)
+		}
+		receipts = append(receipts, rcpt)
+		return nil
+	}); err != nil {
+		return nil, err
+	}
+	return receipts, nil
+}
+
 func (cs *ChainStore) MessagesForBlock(ctx context.Context, b *types.BlockHeader) ([]*types.Message, []*types.SignedMessage, error) {
 	blscids, secpkcids, err := cs.ReadMsgMetaCids(ctx, b.Messages)
 	if err != nil {
@@ -7,7 +7,6 @@ import (
 	"io"
 	"math"
 	"sort"
-	time "time"

 	cid "github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
@@ -16,7 +15,6 @@ import (
 	address "github.com/filecoin-project/go-address"
 	abi "github.com/filecoin-project/go-state-types/abi"
 	crypto "github.com/filecoin-project/go-state-types/crypto"
-	exitcode "github.com/filecoin-project/go-state-types/exitcode"
 	proof "github.com/filecoin-project/go-state-types/proof"
 )

@@ -2080,659 +2078,3 @@ func (t *EventEntry) UnmarshalCBOR(r io.Reader) (err error) {
 	}
 	return nil
 }
-
-var lengthBufGasTrace = []byte{133}
-
-func (t *GasTrace) MarshalCBOR(w io.Writer) error {
-	if t == nil {
-		_, err := w.Write(cbg.CborNull)
-		return err
-	}
-
-	cw := cbg.NewCborWriter(w)
-
-	if _, err := cw.Write(lengthBufGasTrace); err != nil {
-		return err
-	}
-
-	// t.Name (string) (string)
-	if len(t.Name) > cbg.MaxLength {
-		return xerrors.Errorf("Value in field t.Name was too long")
-	}
-
-	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Name))); err != nil {
-		return err
-	}
-	if _, err := io.WriteString(w, string(t.Name)); err != nil {
-		return err
-	}
-
-	// t.TotalGas (int64) (int64)
-	if t.TotalGas >= 0 {
-		if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(t.TotalGas)); err != nil {
-			return err
-		}
-	} else {
-		if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-t.TotalGas-1)); err != nil {
-			return err
-		}
-	}
-
-	// t.ComputeGas (int64) (int64)
-	if t.ComputeGas >= 0 {
-		if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(t.ComputeGas)); err != nil {
-			return err
-		}
-	} else {
-		if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-t.ComputeGas-1)); err != nil {
-			return err
-		}
-	}
-
-	// t.StorageGas (int64) (int64)
-	if t.StorageGas >= 0 {
-		if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(t.StorageGas)); err != nil {
-			return err
-		}
-	} else {
-		if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-t.StorageGas-1)); err != nil {
-			return err
-		}
-	}
-
-	// t.TimeTaken (time.Duration) (int64)
-	if t.TimeTaken >= 0 {
-		if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(t.TimeTaken)); err != nil {
-			return err
-		}
-	} else {
-		if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-t.TimeTaken-1)); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (t *GasTrace) UnmarshalCBOR(r io.Reader) (err error) {
-	*t = GasTrace{}
-
-	cr := cbg.NewCborReader(r)
-
-	maj, extra, err := cr.ReadHeader()
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if err == io.EOF {
-			err = io.ErrUnexpectedEOF
-		}
-	}()
-
-	if maj != cbg.MajArray {
-		return fmt.Errorf("cbor input should be of type array")
-	}
-
-	if extra != 5 {
-		return fmt.Errorf("cbor input had wrong number of fields")
-	}
-
-	// t.Name (string) (string)
-
-	{
-		sval, err := cbg.ReadString(cr)
-		if err != nil {
-			return err
-		}
-
-		t.Name = string(sval)
-	}
-	// t.TotalGas (int64) (int64)
-	{
-		maj, extra, err := cr.ReadHeader()
-		var extraI int64
-		if err != nil {
-			return err
-		}
-		switch maj {
-		case cbg.MajUnsignedInt:
-			extraI = int64(extra)
-			if extraI < 0 {
-				return fmt.Errorf("int64 positive overflow")
-			}
-		case cbg.MajNegativeInt:
-			extraI = int64(extra)
-			if extraI < 0 {
-				return fmt.Errorf("int64 negative oveflow")
-			}
-			extraI = -1 - extraI
-		default:
-			return fmt.Errorf("wrong type for int64 field: %d", maj)
-		}
-
-		t.TotalGas = int64(extraI)
-	}
-	// t.ComputeGas (int64) (int64)
-	{
-		maj, extra, err := cr.ReadHeader()
-		var extraI int64
-		if err != nil {
-			return err
-		}
-		switch maj {
-		case cbg.MajUnsignedInt:
-			extraI = int64(extra)
-			if extraI < 0 {
-				return fmt.Errorf("int64 positive overflow")
-			}
-		case cbg.MajNegativeInt:
-			extraI = int64(extra)
-			if extraI < 0 {
-				return fmt.Errorf("int64 negative oveflow")
-			}
-			extraI = -1 - extraI
-		default:
-			return fmt.Errorf("wrong type for int64 field: %d", maj)
-		}
-
-		t.ComputeGas = int64(extraI)
-	}
-	// t.StorageGas (int64) (int64)
-	{
-		maj, extra, err := cr.ReadHeader()
-		var extraI int64
-		if err != nil {
-			return err
-		}
-		switch maj {
-		case cbg.MajUnsignedInt:
-			extraI = int64(extra)
-			if extraI < 0 {
-				return fmt.Errorf("int64 positive overflow")
-			}
-		case cbg.MajNegativeInt:
-			extraI = int64(extra)
-			if extraI < 0 {
-				return fmt.Errorf("int64 negative oveflow")
-			}
-			extraI = -1 - extraI
-		default:
-			return fmt.Errorf("wrong type for int64 field: %d", maj)
-		}
-
-		t.StorageGas = int64(extraI)
-	}
-	// t.TimeTaken (time.Duration) (int64)
-	{
-		maj, extra, err := cr.ReadHeader()
-		var extraI int64
-		if err != nil {
-			return err
-		}
-		switch maj {
-		case cbg.MajUnsignedInt:
-			extraI = int64(extra)
-			if extraI < 0 {
-				return fmt.Errorf("int64 positive overflow")
-			}
-		case cbg.MajNegativeInt:
-			extraI = int64(extra)
-			if extraI < 0 {
-				return fmt.Errorf("int64 negative oveflow")
-			}
-			extraI = -1 - extraI
-		default:
-			return fmt.Errorf("wrong type for int64 field: %d", maj)
-		}
-
-		t.TimeTaken = time.Duration(extraI)
-	}
-	return nil
-}
-
-var lengthBufMessageTrace = []byte{134}
-
-func (t *MessageTrace) MarshalCBOR(w io.Writer) error {
-	if t == nil {
-		_, err := w.Write(cbg.CborNull)
-		return err
-	}
-
-	cw := cbg.NewCborWriter(w)
-
-	if _, err := cw.Write(lengthBufMessageTrace); err != nil {
-		return err
-	}
-
-	// t.From (address.Address) (struct)
-	if err := t.From.MarshalCBOR(cw); err != nil {
-		return err
-	}
-
-	// t.To (address.Address) (struct)
-	if err := t.To.MarshalCBOR(cw); err != nil {
-		return err
-	}
-
-	// t.Value (big.Int) (struct)
-	if err := t.Value.MarshalCBOR(cw); err != nil {
-		return err
-	}
-
-	// t.Method (abi.MethodNum) (uint64)
-
-	if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(t.Method)); err != nil {
-		return err
-	}
-
-	// t.Params ([]uint8) (slice)
-	if len(t.Params) > cbg.ByteArrayMaxLen {
-		return xerrors.Errorf("Byte array in field t.Params was too long")
-	}
-
-	if err := cw.WriteMajorTypeHeader(cbg.MajByteString, uint64(len(t.Params))); err != nil {
-		return err
-	}
-
-	if _, err := cw.Write(t.Params[:]); err != nil {
-		return err
-	}
-
-	// t.ParamsCodec (uint64) (uint64)
-
-	if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(t.ParamsCodec)); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (t *MessageTrace) UnmarshalCBOR(r io.Reader) (err error) {
-	*t = MessageTrace{}
-
-	cr := cbg.NewCborReader(r)
-
-	maj, extra, err := cr.ReadHeader()
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if err == io.EOF {
-			err = io.ErrUnexpectedEOF
-		}
-	}()
-
-	if maj != cbg.MajArray {
-		return fmt.Errorf("cbor input should be of type array")
-	}
-
-	if extra != 6 {
-		return fmt.Errorf("cbor input had wrong number of fields")
-	}
-
-	// t.From (address.Address) (struct)
-
-	{
-
-		if err := t.From.UnmarshalCBOR(cr); err != nil {
-			return xerrors.Errorf("unmarshaling t.From: %w", err)
-		}
-
-	}
-	// t.To (address.Address) (struct)
-
-	{
-
-		if err := t.To.UnmarshalCBOR(cr); err != nil {
-			return xerrors.Errorf("unmarshaling t.To: %w", err)
-		}
-
-	}
-	// t.Value (big.Int) (struct)
-
-	{
-
-		if err := t.Value.UnmarshalCBOR(cr); err != nil {
-			return xerrors.Errorf("unmarshaling t.Value: %w", err)
-		}
-
-	}
-	// t.Method (abi.MethodNum) (uint64)
-
-	{
-
-		maj, extra, err = cr.ReadHeader()
-		if err != nil {
-			return err
-		}
-		if maj != cbg.MajUnsignedInt {
-			return fmt.Errorf("wrong type for uint64 field")
-		}
-		t.Method = abi.MethodNum(extra)
-
-	}
-	// t.Params ([]uint8) (slice)
-
-	maj, extra, err = cr.ReadHeader()
-	if err != nil {
-		return err
-	}
-
-	if extra > cbg.ByteArrayMaxLen {
-		return fmt.Errorf("t.Params: byte array too large (%d)", extra)
-	}
-	if maj != cbg.MajByteString {
-		return fmt.Errorf("expected byte array")
-	}
-
-	if extra > 0 {
-		t.Params = make([]uint8, extra)
-	}
-
-	if _, err := io.ReadFull(cr, t.Params[:]); err != nil {
-		return err
-	}
-	// t.ParamsCodec (uint64) (uint64)
-
-	{
-
-		maj, extra, err = cr.ReadHeader()
-		if err != nil {
-			return err
-		}
-		if maj != cbg.MajUnsignedInt {
-			return fmt.Errorf("wrong type for uint64 field")
-		}
-		t.ParamsCodec = uint64(extra)
-
-	}
-	return nil
-}
-
-var lengthBufReturnTrace = []byte{131}
-
-func (t *ReturnTrace) MarshalCBOR(w io.Writer) error {
-	if t == nil {
-		_, err := w.Write(cbg.CborNull)
-		return err
-	}
-
-	cw := cbg.NewCborWriter(w)
-
-	if _, err := cw.Write(lengthBufReturnTrace); err != nil {
-		return err
-	}
-
-	// t.ExitCode (exitcode.ExitCode) (int64)
-	if t.ExitCode >= 0 {
-		if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(t.ExitCode)); err != nil {
-			return err
-		}
-	} else {
-		if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-t.ExitCode-1)); err != nil {
-			return err
-		}
-	}
-
-	// t.Return ([]uint8) (slice)
-	if len(t.Return) > cbg.ByteArrayMaxLen {
-		return xerrors.Errorf("Byte array in field t.Return was too long")
-	}
-
-	if err := cw.WriteMajorTypeHeader(cbg.MajByteString, uint64(len(t.Return))); err != nil {
-		return err
-	}
-
-	if _, err := cw.Write(t.Return[:]); err != nil {
-		return err
-	}
-
-	// t.ReturnCodec (uint64) (uint64)
-
-	if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(t.ReturnCodec)); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (t *ReturnTrace) UnmarshalCBOR(r io.Reader) (err error) {
-	*t = ReturnTrace{}
-
-	cr := cbg.NewCborReader(r)
-
-	maj, extra, err := cr.ReadHeader()
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if err == io.EOF {
-			err = io.ErrUnexpectedEOF
-		}
-	}()
-
-	if maj != cbg.MajArray {
-		return fmt.Errorf("cbor input should be of type array")
-	}
-
-	if extra != 3 {
-		return fmt.Errorf("cbor input had wrong number of fields")
-	}
-
-	// t.ExitCode (exitcode.ExitCode) (int64)
-	{
-		maj, extra, err := cr.ReadHeader()
-		var extraI int64
-		if err != nil {
-			return err
-		}
-		switch maj {
-		case cbg.MajUnsignedInt:
-			extraI = int64(extra)
-			if extraI < 0 {
-				return fmt.Errorf("int64 positive overflow")
-			}
-		case cbg.MajNegativeInt:
-			extraI = int64(extra)
-			if extraI < 0 {
-				return fmt.Errorf("int64 negative oveflow")
-			}
-			extraI = -1 - extraI
-		default:
-			return fmt.Errorf("wrong type for int64 field: %d", maj)
-		}
-
-		t.ExitCode = exitcode.ExitCode(extraI)
-	}
-	// t.Return ([]uint8) (slice)
-
-	maj, extra, err = cr.ReadHeader()
-	if err != nil {
-		return err
-	}
-
-	if extra > cbg.ByteArrayMaxLen {
-		return fmt.Errorf("t.Return: byte array too large (%d)", extra)
-	}
-	if maj != cbg.MajByteString {
-		return fmt.Errorf("expected byte array")
-	}
-
-	if extra > 0 {
-		t.Return = make([]uint8, extra)
-	}
-
-	if _, err := io.ReadFull(cr, t.Return[:]); err != nil {
-		return err
-	}
-	// t.ReturnCodec (uint64) (uint64)
-
-	{
-
-		maj, extra, err = cr.ReadHeader()
-		if err != nil {
-			return err
-		}
-		if maj != cbg.MajUnsignedInt {
-			return fmt.Errorf("wrong type for uint64 field")
-		}
-		t.ReturnCodec = uint64(extra)
-
-	}
-	return nil
-}
-
-var lengthBufExecutionTrace = []byte{132}
-
-func (t *ExecutionTrace) MarshalCBOR(w io.Writer) error {
-	if t == nil {
-		_, err := w.Write(cbg.CborNull)
-		return err
-	}
-
-	cw := cbg.NewCborWriter(w)
-
-	if _, err := cw.Write(lengthBufExecutionTrace); err != nil {
-		return err
-	}
-
-	// t.Msg (types.MessageTrace) (struct)
-	if err := t.Msg.MarshalCBOR(cw); err != nil {
-		return err
-	}
-
-	// t.MsgRct (types.ReturnTrace) (struct)
-	if err := t.MsgRct.MarshalCBOR(cw); err != nil {
-		return err
-	}
-
-	// t.GasCharges ([]*types.GasTrace) (slice)
-	if len(t.GasCharges) > 1000000000 {
-		return xerrors.Errorf("Slice value in field t.GasCharges was too long")
-	}
-
-	if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.GasCharges))); err != nil {
-		return err
-	}
-	for _, v := range t.GasCharges {
-		if err := v.MarshalCBOR(cw); err != nil {
-			return err
-		}
-	}
-
-	// t.Subcalls ([]types.ExecutionTrace) (slice)
-	if len(t.Subcalls) > 1000000000 {
-		return xerrors.Errorf("Slice value in field t.Subcalls was too long")
-	}
-
-	if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.Subcalls))); err != nil {
-		return err
-	}
-	for _, v := range t.Subcalls {
-		if err := v.MarshalCBOR(cw); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (t *ExecutionTrace) UnmarshalCBOR(r io.Reader) (err error) {
-	*t = ExecutionTrace{}
-
-	cr := cbg.NewCborReader(r)
-
-	maj, extra, err := cr.ReadHeader()
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if err == io.EOF {
-			err = io.ErrUnexpectedEOF
-		}
-	}()
-
-	if maj != cbg.MajArray {
-		return fmt.Errorf("cbor input should be of type array")
-	}
-
-	if extra != 4 {
-		return fmt.Errorf("cbor input had wrong number of fields")
-	}
-
-	// t.Msg (types.MessageTrace) (struct)
-
-	{
-
-		if err := t.Msg.UnmarshalCBOR(cr); err != nil {
-			return xerrors.Errorf("unmarshaling t.Msg: %w", err)
-		}
-
-	}
-	// t.MsgRct (types.ReturnTrace) (struct)
-
-	{
-
-		if err := t.MsgRct.UnmarshalCBOR(cr); err != nil {
-			return xerrors.Errorf("unmarshaling t.MsgRct: %w", err)
-		}
-
-	}
-	// t.GasCharges ([]*types.GasTrace) (slice)
-
-	maj, extra, err = cr.ReadHeader()
-	if err != nil {
-		return err
-	}
-
-	if extra > 1000000000 {
-		return fmt.Errorf("t.GasCharges: array too large (%d)", extra)
-	}
-
-	if maj != cbg.MajArray {
-		return fmt.Errorf("expected cbor array")
-	}
-
-	if extra > 0 {
-		t.GasCharges = make([]*GasTrace, extra)
-	}
-
-	for i := 0; i < int(extra); i++ {
-
-		var v GasTrace
-		if err := v.UnmarshalCBOR(cr); err != nil {
-			return err
-		}
-
-		t.GasCharges[i] = &v
-	}
-
-	// t.Subcalls ([]types.ExecutionTrace) (slice)
-
-	maj, extra, err = cr.ReadHeader()
-	if err != nil {
-		return err
-	}
-
-	if extra > 1000000000 {
-		return fmt.Errorf("t.Subcalls: array too large (%d)", extra)
-	}
-
-	if maj != cbg.MajArray {
-		return fmt.Errorf("expected cbor array")
-	}
-
-	if extra > 0 {
-		t.Subcalls = make([]ExecutionTrace, extra)
-	}
-
-	for i := 0; i < int(extra); i++ {
-
-		var v ExecutionTrace
-		if err := v.UnmarshalCBOR(cr); err != nil {
-			return err
-		}
-
-		t.Subcalls[i] = v
-	}
-
-	return nil
-}
@@ -44,14 +44,6 @@ type EthTx struct {
 	S                    EthBigInt   `json:"s"`
 }

-func (tx *EthTx) Reward(blkBaseFee big.Int) EthBigInt {
-	availablePriorityFee := big.Sub(big.Int(tx.MaxFeePerGas), blkBaseFee)
-	if big.Cmp(big.Int(tx.MaxPriorityFeePerGas), availablePriorityFee) <= 0 {
-		return tx.MaxPriorityFeePerGas
-	}
-	return EthBigInt(availablePriorityFee)
-}
-
 type EthTxArgs struct {
 	ChainID              int         `json:"chainId"`
 	Nonce                int         `json:"nonce"`
@@ -2,41 +2,44 @@ package types

 import (
 	"encoding/json"
+	"fmt"
+	"regexp"
+	"runtime"
+	"strings"
 	"time"
-
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/filecoin-project/go-state-types/exitcode"
 )

-type GasTrace struct {
-	Name       string
-	TotalGas   int64         `json:"tg"`
-	ComputeGas int64         `json:"cg"`
-	StorageGas int64         `json:"sg"`
-	TimeTaken  time.Duration `json:"tt"`
-}
-
-type MessageTrace struct {
-	From        address.Address
-	To          address.Address
-	Value       abi.TokenAmount
-	Method      abi.MethodNum
-	Params      []byte
-	ParamsCodec uint64
-}
-
-type ReturnTrace struct {
-	ExitCode    exitcode.ExitCode
-	Return      []byte
-	ReturnCodec uint64
-}
-
 type ExecutionTrace struct {
-	Msg        MessageTrace
-	MsgRct     ReturnTrace
-	GasCharges []*GasTrace      `cborgen:"maxlen=1000000000"`
-	Subcalls   []ExecutionTrace `cborgen:"maxlen=1000000000"`
+	Msg        *Message
+	MsgRct     *MessageReceipt
+	Error      string
+	Duration   time.Duration
+	GasCharges []*GasTrace
+
+	Subcalls []ExecutionTrace
+}
+
+type GasTrace struct {
+	Name string
+
+	Location          []Loc `json:"loc"`
+	TotalGas          int64 `json:"tg"`
+	ComputeGas        int64 `json:"cg"`
+	StorageGas        int64 `json:"sg"`
+	TotalVirtualGas   int64 `json:"vtg"`
+	VirtualComputeGas int64 `json:"vcg"`
+	VirtualStorageGas int64 `json:"vsg"`
+
+	TimeTaken time.Duration `json:"tt"`
+	Extra     interface{}   `json:"ex,omitempty"`
+
+	Callers []uintptr `json:"-"`
+}
+
+type Loc struct {
+	File     string
+	Line     int
+	Function string
 }

 func (et ExecutionTrace) SumGas() GasTrace {
@@ -49,13 +52,71 @@ func SumGas(charges []*GasTrace) GasTrace {
 		out.TotalGas += gc.TotalGas
 		out.ComputeGas += gc.ComputeGas
 		out.StorageGas += gc.StorageGas
+
+		out.TotalVirtualGas += gc.TotalVirtualGas
+		out.VirtualComputeGas += gc.VirtualComputeGas
+		out.VirtualStorageGas += gc.VirtualStorageGas
 	}

 	return out
 }

+func (l Loc) Show() bool {
+	ignorePrefix := []string{
+		"reflect.",
+		"github.com/filecoin-project/lotus/chain/vm.(*Invoker).transform",
+		"github.com/filecoin-project/go-amt-ipld/",
+	}
+	for _, pre := range ignorePrefix {
+		if strings.HasPrefix(l.Function, pre) {
+			return false
+		}
+	}
+	return true
+}
+func (l Loc) String() string {
+	file := strings.Split(l.File, "/")
+
+	fn := strings.Split(l.Function, "/")
+	var fnpkg string
+	if len(fn) > 2 {
+		fnpkg = strings.Join(fn[len(fn)-2:], "/")
+	} else {
+		fnpkg = l.Function
+	}
+
+	return fmt.Sprintf("%s@%s:%d", fnpkg, file[len(file)-1], l.Line)
+}
+
+var importantRegex = regexp.MustCompile(`github.com/filecoin-project/specs-actors/(v\d+/)?actors/builtin`)
+
+func (l Loc) Important() bool {
+	return importantRegex.MatchString(l.Function)
+}
+
 func (gt *GasTrace) MarshalJSON() ([]byte, error) {
 	type GasTraceCopy GasTrace
+	if len(gt.Location) == 0 {
+		if len(gt.Callers) != 0 {
+			frames := runtime.CallersFrames(gt.Callers)
+			for {
+				frame, more := frames.Next()
+				if frame.Function == "github.com/filecoin-project/lotus/chain/vm.(*VM).ApplyMessage" {
+					break
+				}
+				l := Loc{
+					File:     frame.File,
+					Line:     frame.Line,
+					Function: frame.Function,
+				}
+				gt.Location = append(gt.Location, l)
+				if !more {
+					break
+				}
+			}
+		}
+	}
+
 	cpy := (*GasTraceCopy)(gt)
 	return json.Marshal(cpy)
 }
@@ -215,4 +215,17 @@ func (m *Message) ValidForBlockInclusion(minGas int64, version network.Version)
 	return nil
 }

+// EffectiveGasPremium returns the effective gas premium claimable by the miner
+// given the supplied base fee.
+//
+// Filecoin clamps the gas premium at GasFeeCap - BaseFee, if lower than the
+// specified premium.
+func (m *Message) EffectiveGasPremium(baseFee abi.TokenAmount) abi.TokenAmount {
+	available := big.Sub(m.GasFeeCap, baseFee)
+	if big.Cmp(m.GasPremium, available) <= 0 {
+		return m.GasPremium
+	}
+	return available
+}
+
 const TestGasLimit = 100e6
@@ -234,6 +234,10 @@ func (ts *TipSet) MinTicketBlock() *BlockHeader {
 	return min
 }

+func (ts *TipSet) ParentMessageReceipts() cid.Cid {
+	return ts.blks[0].ParentMessageReceipts
+}
+
 func (ts *TipSet) ParentState() cid.Cid {
 	return ts.blks[0].ParentStateRoot
 }
@@ -0,0 +1,391 @@
+// Code generated by github.com/whyrusleeping/cbor-gen. DO NOT EDIT.
+
+package vm
+
+import (
+	"fmt"
+	"io"
+	"math"
+	"sort"
+
+	cid "github.com/ipfs/go-cid"
+	cbg "github.com/whyrusleeping/cbor-gen"
+	xerrors "golang.org/x/xerrors"
+
+	types "github.com/filecoin-project/lotus/chain/types"
+)
+
+var _ = xerrors.Errorf
+var _ = cid.Undef
+var _ = math.E
+var _ = sort.Sort
+
+var lengthBufFvmExecutionTrace = []byte{133}
+
+func (t *FvmExecutionTrace) MarshalCBOR(w io.Writer) error {
+	if t == nil {
+		_, err := w.Write(cbg.CborNull)
+		return err
+	}
+
+	cw := cbg.NewCborWriter(w)
+
+	if _, err := cw.Write(lengthBufFvmExecutionTrace); err != nil {
+		return err
+	}
+
+	// t.Msg (types.Message) (struct)
+	if err := t.Msg.MarshalCBOR(cw); err != nil {
+		return err
+	}
+
+	// t.MsgRct (types.MessageReceipt) (struct)
+	if err := t.MsgRct.MarshalCBOR(cw); err != nil {
+		return err
+	}
+
+	// t.Error (string) (string)
+	if len(t.Error) > cbg.MaxLength {
+		return xerrors.Errorf("Value in field t.Error was too long")
+	}
+
+	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Error))); err != nil {
+		return err
+	}
+	if _, err := io.WriteString(w, string(t.Error)); err != nil {
+		return err
+	}
+
+	// t.GasCharges ([]vm.FvmGasCharge) (slice)
+	if len(t.GasCharges) > 1000000000 {
+		return xerrors.Errorf("Slice value in field t.GasCharges was too long")
+	}
+
+	if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.GasCharges))); err != nil {
+		return err
+	}
+	for _, v := range t.GasCharges {
+		if err := v.MarshalCBOR(cw); err != nil {
+			return err
+		}
+	}
+
+	// t.Subcalls ([]vm.FvmExecutionTrace) (slice)
+	if len(t.Subcalls) > 1000000000 {
+		return xerrors.Errorf("Slice value in field t.Subcalls was too long")
+	}
+
+	if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.Subcalls))); err != nil {
+		return err
+	}
+	for _, v := range t.Subcalls {
+		if err := v.MarshalCBOR(cw); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (t *FvmExecutionTrace) UnmarshalCBOR(r io.Reader) (err error) {
+	*t = FvmExecutionTrace{}
+
+	cr := cbg.NewCborReader(r)
+
+	maj, extra, err := cr.ReadHeader()
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if err == io.EOF {
+			err = io.ErrUnexpectedEOF
+		}
+	}()
+
+	if maj != cbg.MajArray {
+		return fmt.Errorf("cbor input should be of type array")
+	}
+
+	if extra != 5 {
+		return fmt.Errorf("cbor input had wrong number of fields")
+	}
+
+	// t.Msg (types.Message) (struct)
+
+	{
+
+		b, err := cr.ReadByte()
+		if err != nil {
+			return err
+		}
+		if b != cbg.CborNull[0] {
+			if err := cr.UnreadByte(); err != nil {
+				return err
+			}
+			t.Msg = new(types.Message)
+			if err := t.Msg.UnmarshalCBOR(cr); err != nil {
+				return xerrors.Errorf("unmarshaling t.Msg pointer: %w", err)
+			}
+		}
+
+	}
+	// t.MsgRct (types.MessageReceipt) (struct)
+
+	{
+
+		b, err := cr.ReadByte()
+		if err != nil {
+			return err
+		}
+		if b != cbg.CborNull[0] {
+			if err := cr.UnreadByte(); err != nil {
+				return err
+			}
+			t.MsgRct = new(types.MessageReceipt)
+			if err := t.MsgRct.UnmarshalCBOR(cr); err != nil {
+				return xerrors.Errorf("unmarshaling t.MsgRct pointer: %w", err)
+			}
+		}
+
+	}
+	// t.Error (string) (string)
+
+	{
+		sval, err := cbg.ReadString(cr)
+		if err != nil {
+			return err
+		}
+
+		t.Error = string(sval)
+	}
+	// t.GasCharges ([]vm.FvmGasCharge) (slice)
+
+	maj, extra, err = cr.ReadHeader()
+	if err != nil {
+		return err
+	}
+
+	if extra > 1000000000 {
+		return fmt.Errorf("t.GasCharges: array too large (%d)", extra)
+	}
+
+	if maj != cbg.MajArray {
+		return fmt.Errorf("expected cbor array")
+	}
+
+	if extra > 0 {
+		t.GasCharges = make([]FvmGasCharge, extra)
+	}
+
+	for i := 0; i < int(extra); i++ {
+
+		var v FvmGasCharge
+		if err := v.UnmarshalCBOR(cr); err != nil {
+			return err
+		}
+
+		t.GasCharges[i] = v
+	}
+
+	// t.Subcalls ([]vm.FvmExecutionTrace) (slice)
+
+	maj, extra, err = cr.ReadHeader()
+	if err != nil {
+		return err
+	}
+
+	if extra > 1000000000 {
+		return fmt.Errorf("t.Subcalls: array too large (%d)", extra)
+	}
+
+	if maj != cbg.MajArray {
+		return fmt.Errorf("expected cbor array")
+	}
+
+	if extra > 0 {
+		t.Subcalls = make([]FvmExecutionTrace, extra)
+	}
+
+	for i := 0; i < int(extra); i++ {
+
+		var v FvmExecutionTrace
+		if err := v.UnmarshalCBOR(cr); err != nil {
+			return err
+		}
+
+		t.Subcalls[i] = v
+	}
+
+	return nil
+}
+
+var lengthBufFvmGasCharge = []byte{132}
+
+func (t *FvmGasCharge) MarshalCBOR(w io.Writer) error {
+	if t == nil {
+		_, err := w.Write(cbg.CborNull)
+		return err
+	}
+
+	cw := cbg.NewCborWriter(w)
+
+	if _, err := cw.Write(lengthBufFvmGasCharge); err != nil {
+		return err
+	}
+
+	// t.Name (string) (string)
+	if len(t.Name) > cbg.MaxLength {
+		return xerrors.Errorf("Value in field t.Name was too long")
+	}
+
+	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Name))); err != nil {
+		return err
+	}
+	if _, err := io.WriteString(w, string(t.Name)); err != nil {
+		return err
+	}
+
+	// t.TotalGas (int64) (int64)
+	if t.TotalGas >= 0 {
+		if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(t.TotalGas)); err != nil {
+			return err
+		}
+	} else {
+		if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-t.TotalGas-1)); err != nil {
+			return err
+		}
+	}
+
+	// t.ComputeGas (int64) (int64)
+	if t.ComputeGas >= 0 {
+		if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(t.ComputeGas)); err != nil {
+			return err
+		}
+	} else {
+		if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-t.ComputeGas-1)); err != nil {
+			return err
+		}
+	}
+
+	// t.StorageGas (int64) (int64)
+	if t.StorageGas >= 0 {
+		if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(t.StorageGas)); err != nil {
+			return err
+		}
+	} else {
+		if err := cw.WriteMajorTypeHeader(cbg.MajNegativeInt, uint64(-t.StorageGas-1)); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (t *FvmGasCharge) UnmarshalCBOR(r io.Reader) (err error) {
+	*t = FvmGasCharge{}
+
+	cr := cbg.NewCborReader(r)
+
+	maj, extra, err := cr.ReadHeader()
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if err == io.EOF {
+			err = io.ErrUnexpectedEOF
+		}
+	}()
+
+	if maj != cbg.MajArray {
+		return fmt.Errorf("cbor input should be of type array")
+	}
+
+	if extra != 4 {
+		return fmt.Errorf("cbor input had wrong number of fields")
+	}
+
+	// t.Name (string) (string)
+
+	{
+		sval, err := cbg.ReadString(cr)
+		if err != nil {
+			return err
+		}
+
+		t.Name = string(sval)
+	}
+	// t.TotalGas (int64) (int64)
+	{
+		maj, extra, err := cr.ReadHeader()
+		var extraI int64
+		if err != nil {
+			return err
+		}
+		switch maj {
+		case cbg.MajUnsignedInt:
+			extraI = int64(extra)
+			if extraI < 0 {
+				return fmt.Errorf("int64 positive overflow")
+			}
+		case cbg.MajNegativeInt:
+			extraI = int64(extra)
+			if extraI < 0 {
+				return fmt.Errorf("int64 negative oveflow")
+			}
+			extraI = -1 - extraI
+		default:
+			return fmt.Errorf("wrong type for int64 field: %d", maj)
+		}
+
+		t.TotalGas = int64(extraI)
+	}
+	// t.ComputeGas (int64) (int64)
+	{
+		maj, extra, err := cr.ReadHeader()
+		var extraI int64
+		if err != nil {
+			return err
+		}
+		switch maj {
+		case cbg.MajUnsignedInt:
+			extraI = int64(extra)
+			if extraI < 0 {
+				return fmt.Errorf("int64 positive overflow")
+			}
+		case cbg.MajNegativeInt:
+			extraI = int64(extra)
+			if extraI < 0 {
+				return fmt.Errorf("int64 negative oveflow")
+			}
+			extraI = -1 - extraI
+		default:
+			return fmt.Errorf("wrong type for int64 field: %d", maj)
+		}
+
+		t.ComputeGas = int64(extraI)
+	}
+	// t.StorageGas (int64) (int64)
+	{
+		maj, extra, err := cr.ReadHeader()
+		var extraI int64
+		if err != nil {
+			return err
+		}
+		switch maj {
+		case cbg.MajUnsignedInt:
+			extraI = int64(extra)
+			if extraI < 0 {
+				return fmt.Errorf("int64 positive overflow")
+			}
+		case cbg.MajNegativeInt:
+			extraI = int64(extra)
+			if extraI < 0 {
+				return fmt.Errorf("int64 negative oveflow")
+			}
+			extraI = -1 - extraI
+		default:
+			return fmt.Errorf("wrong type for int64 field: %d", maj)
+		}
+
+		t.StorageGas = int64(extraI)
+	}
+	return nil
+}
@@ -51,6 +51,57 @@ type FvmExtern struct {
 	base    cid.Cid
 }

+type FvmGasCharge struct {
+	Name       string
+	TotalGas   int64
+	ComputeGas int64
+	StorageGas int64
+}
+
+// This may eventually become identical to ExecutionTrace, but we can make incremental progress towards that
+type FvmExecutionTrace struct {
+	Msg        *types.Message
+	MsgRct     *types.MessageReceipt
+	Error      string
+	GasCharges []FvmGasCharge      `cborgen:"maxlen=1000000000"`
+	Subcalls   []FvmExecutionTrace `cborgen:"maxlen=1000000000"`
+}
+
+func (t *FvmExecutionTrace) ToExecutionTrace() types.ExecutionTrace {
+	if t == nil {
+		return types.ExecutionTrace{}
+	}
+
+	ret := types.ExecutionTrace{
+		Msg:      t.Msg,
+		MsgRct:   t.MsgRct,
+		Error:    t.Error,
+		Subcalls: nil, // Should be nil when there are no subcalls for backwards compatibility
+	}
+
+	if len(t.GasCharges) > 0 {
+		ret.GasCharges = make([]*types.GasTrace, len(t.GasCharges))
+		for i, v := range t.GasCharges {
+			ret.GasCharges[i] = &types.GasTrace{
+				Name:       v.Name,
+				TotalGas:   v.TotalGas,
+				ComputeGas: v.ComputeGas,
+				StorageGas: v.StorageGas,
+			}
+		}
+	}
+
+	if len(t.Subcalls) > 0 {
+		ret.Subcalls = make([]types.ExecutionTrace, len(t.Subcalls))
+
+		for i, v := range t.Subcalls {
+			ret.Subcalls[i] = v.ToExecutionTrace()
+		}
+	}
+
+	return ret
+}
+
 func (x *FvmExtern) TipsetCid(ctx context.Context, epoch abi.ChainEpoch) (cid.Cid, error) {
 	tsk, err := x.tsGet(ctx, epoch)
 	if err != nil {
@@ -436,9 +487,19 @@ func (vm *FVM) ApplyMessage(ctx context.Context, cmsg types.ChainMsg) (*ApplyRet

 	var et types.ExecutionTrace
 	if len(ret.ExecTraceBytes) != 0 {
-		if err = et.UnmarshalCBOR(bytes.NewReader(ret.ExecTraceBytes)); err != nil {
+		var fvmEt FvmExecutionTrace
+		if err = fvmEt.UnmarshalCBOR(bytes.NewReader(ret.ExecTraceBytes)); err != nil {
 			return nil, xerrors.Errorf("failed to unmarshal exectrace: %w", err)
 		}
+		et = fvmEt.ToExecutionTrace()
+	}
+
+	// Set the top-level exectrace info from the message and receipt for backwards compatibility
+	et.Msg = vmMsg
+	et.MsgRct = &receipt
+	et.Duration = duration
+	if aerr != nil {
+		et.Error = aerr.Error()
 	}

 	applyRet := &ApplyRet{
@@ -501,9 +562,18 @@ func (vm *FVM) ApplyImplicitMessage(ctx context.Context, cmsg *types.Message) (*

 	var et types.ExecutionTrace
 	if len(ret.ExecTraceBytes) != 0 {
-		if err = et.UnmarshalCBOR(bytes.NewReader(ret.ExecTraceBytes)); err != nil {
+		var fvmEt FvmExecutionTrace
+		if err = fvmEt.UnmarshalCBOR(bytes.NewReader(ret.ExecTraceBytes)); err != nil {
 			return nil, xerrors.Errorf("failed to unmarshal exectrace: %w", err)
 		}
+		et = fvmEt.ToExecutionTrace()
+	} else {
+		et.Msg = vmMsg
+		et.MsgRct = &receipt
+		et.Duration = duration
+		if aerr != nil {
+			et.Error = aerr.Error()
+		}
 	}

 	applyRet := &ApplyRet{
@@ -6,6 +6,7 @@ import (
 	"encoding/binary"
 	"fmt"
 	"os"
+	gruntime "runtime"
 	"time"

 	"github.com/ipfs/go-cid"
@@ -570,18 +571,35 @@ func (rt *Runtime) chargeGasFunc(skip int) func(GasCharge) {
 func (rt *Runtime) chargeGasInternal(gas GasCharge, skip int) aerrors.ActorError {
 	toUse := gas.Total()
 	if EnableDetailedTracing {
+		var callers [10]uintptr
+
+		cout := gruntime.Callers(2+skip, callers[:])
+
 		now := build.Clock.Now()
 		if rt.lastGasCharge != nil {
 			rt.lastGasCharge.TimeTaken = now.Sub(rt.lastGasChargeTime)
 		}

 		gasTrace := types.GasTrace{
-			Name: gas.Name,
+			Name:  gas.Name,
+			Extra: gas.Extra,

 			TotalGas:   toUse,
 			ComputeGas: gas.ComputeGas,
 			StorageGas: gas.StorageGas,
+
+			VirtualComputeGas: gas.VirtualCompute,
+			VirtualStorageGas: gas.VirtualStorage,
+
+			Callers: callers[:cout],
 		}
+		if gasTrace.VirtualStorageGas == 0 {
+			gasTrace.VirtualStorageGas = gasTrace.StorageGas
+		}
+		if gasTrace.VirtualComputeGas == 0 {
+			gasTrace.VirtualComputeGas = gasTrace.ComputeGas
+		}
+		gasTrace.TotalVirtualGas = gasTrace.VirtualComputeGas + gasTrace.VirtualStorageGas

 		rt.executionTrace.GasCharges = append(rt.executionTrace.GasCharges, &gasTrace)
 		rt.lastGasChargeTime = now
@@ -38,7 +38,6 @@ import (
 )

 const MaxCallDepth = 4096
-const CborCodec = 0x51

 var (
 	log            = logging.Logger("vm")
@@ -126,10 +125,6 @@ func (bs *gasChargingBlocks) Put(ctx context.Context, blk block.Block) error {
 }

 func (vm *LegacyVM) makeRuntime(ctx context.Context, msg *types.Message, parent *Runtime) *Runtime {
-	paramsCodec := uint64(0)
-	if len(msg.Params) > 0 {
-		paramsCodec = CborCodec
-	}
 	rt := &Runtime{
 		ctx:         ctx,
 		vm:          vm,
@@ -145,14 +140,7 @@ func (vm *LegacyVM) makeRuntime(ctx context.Context, msg *types.Message, parent
 		pricelist:        PricelistByEpoch(vm.blockHeight),
 		allowInternal:    true,
 		callerValidated:  false,
-		executionTrace: types.ExecutionTrace{Msg: types.MessageTrace{
-			From:        msg.From,
-			To:          msg.To,
-			Value:       msg.Value,
-			Method:      msg.Method,
-			Params:      msg.Params,
-			ParamsCodec: paramsCodec,
-		}},
+		executionTrace:   types.ExecutionTrace{Msg: msg},
 	}

 	if parent != nil {
@@ -381,14 +369,15 @@ func (vm *LegacyVM) send(ctx context.Context, msg *types.Message, parent *Runtim
 		return nil, nil
 	}()

-	retCodec := uint64(0)
-	if len(ret) > 0 {
-		retCodec = CborCodec
+	mr := types.MessageReceipt{
+		ExitCode: aerrors.RetCode(err),
+		Return:   ret,
+		GasUsed:  rt.gasUsed,
 	}
-	rt.executionTrace.MsgRct = types.ReturnTrace{
-		ExitCode:    aerrors.RetCode(err),
-		Return:      ret,
-		ReturnCodec: retCodec,
+	rt.executionTrace.MsgRct = &mr
+	rt.executionTrace.Duration = time.Since(start)
+	if err != nil {
+		rt.executionTrace.Error = err.Error()
 	}

 	return ret, err, rt
@@ -22,6 +22,7 @@ import (
 	"github.com/ipfs/go-cid"
 	cbor "github.com/ipfs/go-ipld-cbor"
 	"github.com/multiformats/go-multiaddr"
+	"github.com/multiformats/go-multihash"
 	"github.com/urfave/cli/v2"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
@@ -1227,7 +1228,7 @@ var compStateTemplate = `
  <div>State CID: <b>{{.Comp.Root}}</b></div>
  <div>Calls</div>
  {{range .Comp.Trace}}
-   {{template "message" (Call .ExecutionTrace false .MsgCid.String)}}
+   {{template "message" (Call .ExecutionTrace false .Msg.Cid.String)}}
  {{end}}
 </body>
 </html>
@@ -1252,12 +1253,16 @@ var compStateMsg = `
 </a>
 </div>

- <div><b>{{.Msg.From}}</b> -&gt; <b>{{.Msg.To}}</b> ({{ToFil .Msg.Value}}), M{{.Msg.Method}}</div>
- {{if not .Subcall}}<div><small>Msg CID: {{.Hash}}</small></div>{{end}}
+ <div><b>{{.Msg.From}}</b> -&gt; <b>{{.Msg.To}}</b> ({{ToFil .Msg.Value}} FIL), M{{.Msg.Method}}</div>
+ {{if not .Subcall}}<div><small>Msg CID: {{.Msg.Cid}}</small></div>{{end}}
 {{if gt (len .Msg.Params) 0}}
  <div><pre class="params">{{JsonParams ($code) (.Msg.Method) (.Msg.Params) | html}}</pre></div>
 {{end}}
+ {{if PrintTiming}}
+  <div><span class="slow-{{IsSlow .Duration}}-{{IsVerySlow .Duration}}">Took {{.Duration}}</span>, <span class="exit{{IntExit .MsgRct.ExitCode}}">Exit: <b>{{.MsgRct.ExitCode}}</b></span>{{if gt (len .MsgRct.Return) 0}}, Return{{end}}</div>
+ {{else}}
  <div><span class="exit{{IntExit .MsgRct.ExitCode}}">Exit: <b>{{.MsgRct.ExitCode}}</b></span>{{if gt (len .MsgRct.Return) 0}}, Return{{end}}</div>
+ {{end}}
 {{if gt (len .MsgRct.Return) 0}}
  <div><pre class="ret">{{JsonReturn ($code) (.Msg.Method) (.MsgRct.Return) | html}}</pre></div>
 {{end}}
@@ -1269,26 +1274,62 @@ var compStateMsg = `
 <details>
 <summary>Gas Trace</summary>
 <table>
- <tr><th>Name</th><th>Total/Compute/Storage</th><th>Time Taken</th></tr>
+ <tr><th>Name</th><th>Total/Compute/Storage</th><th>Time Taken</th><th>Location</th></tr>
+ {{define "virt" -}}
+ {{- if . -}}
+ <span class="deemp">+({{.}})</span>
+ {{- end -}}
+ {{- end}}

 {{define "gasC" -}}
- <td>{{.TotalGas}}/{{.ComputeGas}}/{{.StorageGas}}</td>
+ <td>{{.TotalGas}}{{template "virt" .TotalVirtualGas }}/{{.ComputeGas}}{{template "virt" .VirtualComputeGas}}/{{.StorageGas}}{{template "virt" .VirtualStorageGas}}</td>
 {{- end}}

 {{range .GasCharges}}
-  <tr>
-   <td>{{.Name}}</td>
-   {{template "gasC" .}}
-   <td>{{if PrintTiming}}{{.TimeTaken}}{{end}}</td>
-  </tr>
- {{end}}
- {{with sumGas .GasCharges}}
-  <tr class="sum">
-    <td><b>Sum</b></td>
-    {{template "gasC" .}}
-    <td>{{if PrintTiming}}{{.TimeTaken}}{{end}}</td>
-  </tr>
- {{end}}
+ <tr><td>{{.Name}}{{if .Extra}}:{{.Extra}}{{end}}</td>
+ {{template "gasC" .}}
+ <td>{{if PrintTiming}}{{.TimeTaken}}{{end}}</td>
+  <td>
+   {{ $fImp := FirstImportant .Location }}
+   {{ if $fImp }}
+   <details>
+    <summary>{{ $fImp }}</summary><hr />
+	{{ $elipOn := false }}
+    {{ range $index, $ele := .Location -}}
+     {{- if $index }}<br />{{end -}}
+     {{- if .Show -}}
+	  {{ if $elipOn }}
+	   {{ $elipOn = false }}
+       </span></label>
+	  {{end}}
+
+      {{- if .Important }}<b>{{end -}}
+      {{- . -}}
+      {{if .Important }}</b>{{end}}
+     {{else}}
+	  {{ if not $elipOn }}
+	    {{ $elipOn = true }}
+        <label class="ellipsis-toggle"><input type="checkbox" /><span class="ellipsis">[…]<br /></span>
+		<span class="ellipsis-content">
+	  {{end}}
+      {{- "" -}}
+      {{- . -}}
+     {{end}}
+    {{end}}
+	{{ if $elipOn }}
+	  {{ $elipOn = false }}
+      </span></label>
+	{{end}}
+   </details>
+  {{end}}
+  </td></tr>
+  {{end}}
+  {{with sumGas .GasCharges}}
+  <tr class="sum"><td><b>Sum</b></td>
+  {{template "gasC" .}}
+  <td>{{if PrintTiming}}{{.TimeTaken}}{{end}}</td>
+  <td></td></tr>
+  {{end}}
 </table>
 </details>

@@ -1296,8 +1337,8 @@ var compStateMsg = `
 {{if gt (len .Subcalls) 0}}
  <div>Subcalls:</div>
  {{$hash := .Hash}}
-  {{range $i, $call := .Subcalls}}
-   {{template "message" (Call $call true (printf "%s-%d" $hash $i))}}
+  {{range .Subcalls}}
+   {{template "message" (Call . true (printf "%s-%s" $hash .Msg.Cid.String))}}
  {{end}}
 {{end}}
 </div>`
@@ -1318,9 +1359,20 @@ func ComputeStateHTMLTempl(w io.Writer, ts *types.TipSet, o *api.ComputeStateOut
 		"IsVerySlow":  isVerySlow,
 		"IntExit":     func(i exitcode.ExitCode) int64 { return int64(i) },
 		"sumGas":      types.SumGas,
-		"CodeStr":     builtin.ActorNameByCode,
+		"CodeStr":     codeStr,
 		"Call":        call,
 		"PrintTiming": func() bool { return printTiming },
+		"FirstImportant": func(locs []types.Loc) *types.Loc {
+			if len(locs) != 0 {
+				for _, l := range locs {
+					if l.Important() {
+						return &l
+					}
+				}
+				return &locs[0]
+			}
+			return nil
+		},
 	}).Parse(compStateTemplate)
 	if err != nil {
 		return err
@@ -1350,6 +1402,14 @@ func call(e types.ExecutionTrace, subcall bool, hash string) callMeta {
 	}
 }

+func codeStr(c cid.Cid) string {
+	cmh, err := multihash.Decode(c.Hash())
+	if err != nil {
+		panic(err)
+	}
+	return string(cmh.Digest)
+}
+
 func getMethod(code cid.Cid, method abi.MethodNum) string {
 	return filcns.NewActorRegistry().Methods[code][method].Name // todo: use remote
 }
@@ -466,11 +466,14 @@ var importBenchCmd = &cli.Command{
 				Duration: time.Since(start),
 			}
 			if enc != nil {
+				stripCallers(tse.Trace)
+
 				if err := enc.Encode(tse); err != nil {
 					return xerrors.Errorf("failed to write out tipsetexec: %w", err)
 				}
 			}
 			if inverseChain[i-1].ParentState() != st {
+				stripCallers(tse.Trace)
 				lastTrace := tse.Trace
 				d, err := json.MarshalIndent(lastTrace, "", "  ")
 				if err != nil {
@@ -489,6 +492,21 @@ var importBenchCmd = &cli.Command{
 	},
 }

+func walkExecutionTrace(et *types.ExecutionTrace) {
+	for _, gc := range et.GasCharges {
+		gc.Callers = nil
+	}
+	for _, sub := range et.Subcalls {
+		walkExecutionTrace(&sub) //nolint:scopelint,gosec
+	}
+}
+
+func stripCallers(trace []*api.InvocResult) {
+	for _, t := range trace {
+		walkExecutionTrace(&t.ExecutionTrace)
+	}
+}
+
 type Invocation struct {
 	TipSet types.TipSetKey
 	Invoc  *api.InvocResult
@@ -496,24 +514,28 @@ type Invocation struct {

 const GasPerNs = 10

-func countGasCosts(et *types.ExecutionTrace) int64 {
-	var cgas int64
+func countGasCosts(et *types.ExecutionTrace) (int64, int64) {
+	var cgas, vgas int64

 	for _, gc := range et.GasCharges {
 		cgas += gc.ComputeGas
+		vgas += gc.VirtualComputeGas
 	}

 	for _, sub := range et.Subcalls {
-		c := countGasCosts(&sub) //nolint
+		c, v := countGasCosts(&sub) //nolint
 		cgas += c
+		vgas += v
 	}

-	return cgas
+	return cgas, vgas
 }

 type stats struct {
 	timeTaken meanVar
 	gasRatio  meanVar
+
+	extraCovar *covar
 }

 type covar struct {
@@ -658,8 +680,32 @@ func (v1 *meanVar) Combine(v2 *meanVar) {
 	v1.m2 = m2
 }

+func getExtras(ex interface{}) (*string, *float64) {
+	if t, ok := ex.(string); ok {
+		return &t, nil
+	}
+	if size, ok := ex.(float64); ok {
+		return nil, &size
+	}
+	if exMap, ok := ex.(map[string]interface{}); ok {
+		t, tok := exMap["type"].(string)
+		size, sok := exMap["size"].(float64)
+		if tok && sok {
+			return &t, &size
+		}
+		if tok {
+			return &t, nil
+		}
+		if sok {
+			return nil, &size
+		}
+		return nil, nil
+	}
+	return nil, nil
+}
+
 func tallyGasCharges(charges map[string]*stats, et types.ExecutionTrace) {
-	for _, gc := range et.GasCharges {
+	for i, gc := range et.GasCharges {
 		name := gc.Name
 		if name == "OnIpldGetEnd" {
 			continue
@@ -670,18 +716,45 @@ func tallyGasCharges(charges map[string]*stats, et types.ExecutionTrace) {
 			// discard initial very long OnVerifyPost
 			continue
 		}
+		eType, eSize := getExtras(gc.Extra)
+
+		if name == "OnIpldGet" {
+			next := &types.GasTrace{}
+			if i+1 < len(et.GasCharges) {
+				next = et.GasCharges[i+1]
+			}
+			if next.Name != "OnIpldGetEnd" {
+				log.Warn("OnIpldGet without OnIpldGetEnd")
+			} else {
+				_, size := getExtras(next.Extra)
+				eSize = size
+			}
+		}
+		if eType != nil {
+			name += "-" + *eType
+		}
 		compGas := gc.ComputeGas
+		if compGas == 0 {
+			compGas = gc.VirtualComputeGas
+		}
+		if compGas == 0 {
+			compGas = 1
+		}
 		s := charges[name]
 		if s == nil {
 			s = new(stats)
 			charges[name] = s
 		}

+		if eSize != nil {
+			if s.extraCovar == nil {
+				s.extraCovar = &covar{}
+			}
+			s.extraCovar.AddPoint(*eSize, tt)
+		}
+
 		s.timeTaken.AddPoint(tt)

-		if compGas == 0 {
-			compGas = 1
-		}
 		ratio := tt / float64(compGas) * GasPerNs
 		s.gasRatio.AddPoint(ratio)
 	}
@@ -807,6 +880,13 @@ var importAnalyzeCmd = &cli.Command{
 				}
 				s.timeTaken.Combine(&v.timeTaken)
 				s.gasRatio.Combine(&v.gasRatio)
+
+				if v.extraCovar != nil {
+					if s.extraCovar == nil {
+						s.extraCovar = &covar{}
+					}
+					s.extraCovar.Combine(v.extraCovar)
+				}
 			}
 			totalTime += res.totalTime
 		}
@@ -822,6 +902,13 @@ var importAnalyzeCmd = &cli.Command{
 			s := charges[k]
 			fmt.Printf("%s: incr by %.4f~%.4f; tt %.4f~%.4f\n", k, s.gasRatio.Mean(), s.gasRatio.Stddev(),
 				s.timeTaken.Mean(), s.timeTaken.Stddev())
+			if s.extraCovar != nil {
+				fmt.Printf("\t correll: %.2f, tt = %.2f * extra + %.2f\n", s.extraCovar.Correl(),
+					s.extraCovar.A(), s.extraCovar.B())
+				fmt.Printf("\t covar: %.2f, extra: %.2f~%.2f, tt2: %.2f~%.2f, count %.0f\n",
+					s.extraCovar.Covariance(), s.extraCovar.meanX, s.extraCovar.StddevX(),
+					s.extraCovar.meanY, s.extraCovar.StddevY(), s.extraCovar.n)
+			}
 		}

 		sort.Slice(invocs, func(i, j int) bool {
@@ -407,18 +407,8 @@ var sealBenchCmd = &cli.Command{
 			}
 			verifyWinningPost2 := time.Now()

-			ppt, err := sealedSectors[0].SealProof.RegisteredWindowPoStProof()
-			if err != nil {
-				return err
-			}
-
-			ppt, err = ppt.ToV1_1PostProof()
-			if err != nil {
-				return err
-			}
-
 			log.Info("computing window post snark (cold)")
-			wproof1, _, err := sb.GenerateWindowPoSt(context.TODO(), mid, ppt, extendedSealedSectors, challenge[:])
+			wproof1, _, err := sb.GenerateWindowPoSt(context.TODO(), mid, extendedSealedSectors, challenge[:])
 			if err != nil {
 				return err
 			}
@@ -426,7 +416,7 @@ var sealBenchCmd = &cli.Command{
 			windowpost1 := time.Now()

 			log.Info("computing window post snark (hot)")
-			wproof2, _, err := sb.GenerateWindowPoSt(context.TODO(), mid, ppt, extendedSealedSectors, challenge[:])
+			wproof2, _, err := sb.GenerateWindowPoSt(context.TODO(), mid, extendedSealedSectors, challenge[:])
 			if err != nil {
 				return err
 			}
@@ -2,28 +2,21 @@ package main

 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"os"
 	"path"

-	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-datastore"
 	dsq "github.com/ipfs/go-datastore/query"
 	levelds "github.com/ipfs/go-ds-leveldb"
-	ipldcbor "github.com/ipfs/go-ipld-cbor"
 	logging "github.com/ipfs/go-log/v2"
 	ldbopts "github.com/syndtr/goleveldb/leveldb/opt"
 	"github.com/urfave/cli/v2"
-	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"

 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
-	"github.com/filecoin-project/go-state-types/builtin"
-	market11 "github.com/filecoin-project/go-state-types/builtin/v11/market"
-	"github.com/filecoin-project/go-state-types/builtin/v11/util/adt"

 	"github.com/filecoin-project/lotus/chain/actors/builtin/market"
 	"github.com/filecoin-project/lotus/chain/types"
@@ -41,85 +34,6 @@ var marketCmd = &cli.Command{
 		marketExportDatastoreCmd,
 		marketImportDatastoreCmd,
 		marketDealsTotalStorageCmd,
-		marketCronStateCmd,
-	},
-}
-
-var marketCronStateCmd = &cli.Command{
-	Name:  "cron-state",
-	Usage: "Display summary of all deal operation state scheduled for cron processing",
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:  "tipset",
-			Usage: "specify tipset to call method on (pass comma separated array of cids)",
-		},
-	},
-	Action: func(cctx *cli.Context) error {
-		ctx := lcli.ReqContext(cctx)
-		api, closer, err := lcli.GetFullNodeAPI(cctx)
-		if err != nil {
-			return err
-		}
-		defer closer()
-		ts, err := lcli.LoadTipSet(ctx, cctx, api)
-		if err != nil {
-			return err
-		}
-		a, err := api.StateReadState(ctx, builtin.StorageMarketActorAddr, ts.Key())
-		if err != nil {
-			return err
-		}
-		st, ok := a.State.(map[string]interface{})
-		if !ok {
-			return xerrors.Errorf("failed to cast state map to expected form")
-		}
-		dealOpsRaw, ok := st["DealOpsByEpoch"].(map[string]interface{})
-		if !ok {
-			return xerrors.Errorf("failed to read sectors root from state")
-		}
-		// string is of the form "/:bafy.." so [2:] to drop the path
-		dealOpsRoot, err := cid.Parse(dealOpsRaw["/"])
-		if err != nil {
-			return err
-		}
-		bs := ReadOnlyAPIBlockstore{api}
-		adtStore := adt.WrapStore(ctx, ipldcbor.NewCborStore(&bs))
-		dealOpsEpochSet, err := adt.AsMap(adtStore, dealOpsRoot, builtin.DefaultHamtBitwidth)
-		if err != nil {
-			return err
-		}
-		dealOpsRecord := make(map[uint64][]abi.DealID)
-		if err := dealOpsEpochSet.ForEach(&cbg.Deferred{}, func(eKey string) error {
-			e, err := abi.ParseUIntKey(eKey)
-			if err != nil {
-				return err
-			}
-			dealOpsRecord[e] = make([]abi.DealID, 0)
-			return nil
-		}); err != nil {
-			return err
-		}
-
-		dealOpsMultiMap, err := market11.AsSetMultimap(adtStore, dealOpsRoot, builtin.DefaultHamtBitwidth, builtin.DefaultHamtBitwidth)
-		if err != nil {
-			return err
-		}
-		for e := range dealOpsRecord {
-			e := e
-			err := dealOpsMultiMap.ForEach(abi.ChainEpoch(e), func(id abi.DealID) error {
-				dealOpsRecord[e] = append(dealOpsRecord[e], id)
-				return nil
-			})
-			if err != nil {
-				return err
-			}
-		}
-		jsonStr, err := json.Marshal(dealOpsRecord)
-		if err != nil {
-			return err
-		}
-		fmt.Printf("%s\n", jsonStr)
-		return nil
 	},
 }

@@ -3,8 +3,7 @@ package main
 import (
 	"context"
 	"fmt"
-	"os"
-	"path/filepath"
+	"io"
 	"strconv"
 	"time"

@@ -19,7 +18,6 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/builtin"
 	v10 "github.com/filecoin-project/go-state-types/builtin/v10"
-	v11 "github.com/filecoin-project/go-state-types/builtin/v11"
 	market8 "github.com/filecoin-project/go-state-types/builtin/v8/market"
 	adt8 "github.com/filecoin-project/go-state-types/builtin/v8/util/adt"
 	v9 "github.com/filecoin-project/go-state-types/builtin/v9"
@@ -33,8 +31,6 @@ import (
 	"github.com/filecoin-project/specs-actors/v7/actors/migration/nv15"

 	"github.com/filecoin-project/lotus/blockstore"
-	badgerbs "github.com/filecoin-project/lotus/blockstore/badger"
-	"github.com/filecoin-project/lotus/blockstore/splitstore"
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	lbuiltin "github.com/filecoin-project/lotus/chain/actors/builtin"
@@ -103,52 +99,24 @@ var migrationsCmd = &cli.Command{

 		defer lkrepo.Close() //nolint:errcheck

-		cold, err := lkrepo.Blockstore(ctx, repo.UniversalBlockstore)
+		bs, err := lkrepo.Blockstore(ctx, repo.UniversalBlockstore)
 		if err != nil {
-			return fmt.Errorf("failed to open universal blockstore %w", err)
+			return fmt.Errorf("failed to open blockstore: %w", err)
 		}

-		path, err := lkrepo.SplitstorePath()
-		if err != nil {
-			return err
-		}
-
-		path = filepath.Join(path, "hot.badger")
-		if err := os.MkdirAll(path, 0755); err != nil {
-			return err
-		}
-
-		opts, err := repo.BadgerBlockstoreOptions(repo.HotBlockstore, path, lkrepo.Readonly())
-		if err != nil {
-			return err
-		}
-
-		hot, err := badgerbs.Open(opts)
-		if err != nil {
-			return err
-		}
+		defer func() {
+			if c, ok := bs.(io.Closer); ok {
+				if err := c.Close(); err != nil {
+					log.Warnf("failed to close blockstore: %s", err)
+				}
+			}
+		}()

 		mds, err := lkrepo.Datastore(context.Background(), "/metadata")
 		if err != nil {
 			return err
 		}

-		cfg := &splitstore.Config{
-			MarkSetType:       "map",
-			DiscardColdBlocks: true,
-		}
-		ss, err := splitstore.Open(path, mds, hot, cold, cfg)
-		if err != nil {
-			return err
-		}
-		defer func() {
-			if err := ss.Close(); err != nil {
-				log.Warnf("failed to close blockstore: %s", err)
-
-			}
-		}()
-		bs := ss
-
 		cs := store.NewChainStore(bs, bs, mds, filcns.Weight, nil)
 		defer cs.Close() //nolint:errcheck

@@ -197,7 +165,6 @@ var migrationsCmd = &cli.Command{
 			}

 			preMigrationTime := time.Since(startTime)
-			fmt.Println("completed premigration, took ", preMigrationTime)

 			startTime = time.Now()

@@ -212,7 +179,7 @@ var migrationsCmd = &cli.Command{
 				return xerrors.Errorf("got different results with and without the cache: %s, %s", newCid1,
 					newCid2)
 			}
-
+			fmt.Println("completed premigration, took ", preMigrationTime)
 			fmt.Println("completed round actual (with cache), took ", cachedMigrationTime)
 		}

@@ -236,8 +203,6 @@ func getMigrationFuncsForNetwork(nv network.Version) (UpgradeActorsFunc, PreUpgr
 		return filcns.UpgradeActorsV9, filcns.PreUpgradeActorsV9, checkNv17Invariants, nil
 	case network.Version18:
 		return filcns.UpgradeActorsV10, filcns.PreUpgradeActorsV10, checkNv18Invariants, nil
-	case network.Version19:
-		return filcns.UpgradeActorsV11, filcns.PreUpgradeActorsV11, checkNv19Invariants, nil
 	default:
 		return nil, nil, nil, xerrors.Errorf("migration not implemented for nv%d", nv)
 	}
@@ -247,39 +212,6 @@ type UpgradeActorsFunc = func(context.Context, *stmgr.StateManager, stmgr.Migrat
 type PreUpgradeActorsFunc = func(context.Context, *stmgr.StateManager, stmgr.MigrationCache, cid.Cid, abi.ChainEpoch, *types.TipSet) error
 type CheckInvariantsFunc = func(context.Context, cid.Cid, cid.Cid, blockstore.Blockstore, abi.ChainEpoch) error

-func checkNv19Invariants(ctx context.Context, oldStateRootCid cid.Cid, newStateRootCid cid.Cid, bs blockstore.Blockstore, epoch abi.ChainEpoch) error {
-
-	actorStore := store.ActorStore(ctx, bs)
-	startTime := time.Now()
-
-	// Load the new state root.
-	var newStateRoot types.StateRoot
-	if err := actorStore.Get(ctx, newStateRootCid, &newStateRoot); err != nil {
-		return xerrors.Errorf("failed to decode state root: %w", err)
-	}
-
-	actorCodeCids, err := actors.GetActorCodeIDs(actorstypes.Version11)
-	if err != nil {
-		return err
-	}
-	newActorTree, err := builtin.LoadTree(actorStore, newStateRoot.Actors)
-	if err != nil {
-		return err
-	}
-	messages, err := v11.CheckStateInvariants(newActorTree, epoch, actorCodeCids)
-	if err != nil {
-		return xerrors.Errorf("checking state invariants: %w", err)
-	}
-
-	for _, message := range messages.Messages() {
-		fmt.Println("got the following error: ", message)
-	}
-
-	fmt.Println("completed invariant checks, took ", time.Since(startTime))
-
-	return nil
-}
-
 func checkNv18Invariants(ctx context.Context, oldStateRootCid cid.Cid, newStateRootCid cid.Cid, bs blockstore.Blockstore, epoch abi.ChainEpoch) error {
 	actorStore := store.ActorStore(ctx, bs)
 	startTime := time.Now()
@@ -3,21 +3,16 @@ package main
 import (
 	"bufio"
 	"bytes"
-	"context"
 	"fmt"
 	"io"
 	"os"
 	"path/filepath"
-	"strconv"
 	"strings"

 	"github.com/docker/go-units"
 	"github.com/ipfs/go-cid"
-	ipldcbor "github.com/ipfs/go-ipld-cbor"
-	block "github.com/ipfs/go-libipfs/blocks"
 	"github.com/mitchellh/go-homedir"
 	"github.com/urfave/cli/v2"
-	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"

 	"github.com/filecoin-project/go-address"
@@ -25,13 +20,11 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
 	"github.com/filecoin-project/go-state-types/builtin"
-	"github.com/filecoin-project/go-state-types/builtin/v11/util/adt"
 	miner8 "github.com/filecoin-project/go-state-types/builtin/v8/miner"
 	"github.com/filecoin-project/go-state-types/crypto"
 	power7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/power"
 	"github.com/filecoin-project/specs-actors/v7/actors/runtime/proof"

-	"github.com/filecoin-project/lotus/api/v0api"
 	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
@@ -49,93 +42,6 @@ var minerCmd = &cli.Command{
 		minerFaultsCmd,
 		sendInvalidWindowPoStCmd,
 		generateAndSendConsensusFaultCmd,
-		sectorInfoCmd,
-	},
-}
-
-var _ ipldcbor.IpldBlockstore = new(ReadOnlyAPIBlockstore)
-
-type ReadOnlyAPIBlockstore struct {
-	v0api.FullNode
-}
-
-func (b *ReadOnlyAPIBlockstore) Get(ctx context.Context, c cid.Cid) (block.Block, error) {
-	bs, err := b.ChainReadObj(ctx, c)
-	if err != nil {
-		return nil, err
-	}
-	return block.NewBlock(bs), nil
-}
-
-func (b *ReadOnlyAPIBlockstore) Put(context.Context, block.Block) error {
-	return xerrors.Errorf("cannot put block, the backing blockstore is readonly")
-}
-
-var sectorInfoCmd = &cli.Command{
-	Name:      "sectorinfo",
-	Usage:     "Display cbor of sector info at <minerAddress> <sectorNumber>",
-	ArgsUsage: "[minerAddress] [sector number]",
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:  "tipset",
-			Usage: "specify tipset to call method on (pass comma separated array of cids)",
-		},
-	},
-	Action: func(cctx *cli.Context) error {
-		if cctx.Args().Len() != 2 {
-			return fmt.Errorf("must pass miner address and sector number")
-		}
-		ctx := lcli.ReqContext(cctx)
-		api, closer, err := lcli.GetFullNodeAPI(cctx)
-		if err != nil {
-			return err
-		}
-		defer closer()
-		maddr, err := address.NewFromString(cctx.Args().First())
-		if err != nil {
-			return err
-		}
-		sn, err := strconv.ParseUint(cctx.Args().Slice()[1], 10, 64)
-		if err != nil {
-			return err
-		}
-
-		ts, err := lcli.LoadTipSet(ctx, cctx, api)
-		if err != nil {
-			return err
-		}
-		a, err := api.StateReadState(ctx, maddr, ts.Key())
-		if err != nil {
-			return err
-		}
-		st, ok := a.State.(map[string]interface{})
-		if !ok {
-			return xerrors.Errorf("failed to cast state map to expected form")
-		}
-		sectorsRaw, ok := st["Sectors"].(map[string]interface{})
-		if !ok {
-			return xerrors.Errorf("failed to read sectors root from state")
-		}
-		// string is of the form "/:bafy.." so [2:] to drop the path
-		sectorsRoot, err := cid.Parse(sectorsRaw["/"])
-		if err != nil {
-			return err
-		}
-		bs := ReadOnlyAPIBlockstore{api}
-		sectorsAMT, err := adt.AsArray(adt.WrapStore(ctx, ipldcbor.NewCborStore(&bs)), sectorsRoot, miner8.SectorsAmtBitwidth)
-		if err != nil {
-			return err
-		}
-		out := cbg.Deferred{}
-		found, err := sectorsAMT.Get(sn, &out)
-		if err != nil {
-			return err
-		}
-		if !found {
-			return xerrors.Errorf("sector number %d not found", sn)
-		}
-		fmt.Printf("%x\n", out.Raw)
-		return nil
 	},
 }

@@ -4866,49 +4866,95 @@ Response:
  },
  "ExecutionTrace": {
    "Msg": {
-      "From": "f01234",
+      "Version": 42,
      "To": "f01234",
+      "From": "f01234",
+      "Nonce": 42,
      "Value": "0",
+      "GasLimit": 9,
+      "GasFeeCap": "0",
+      "GasPremium": "0",
      "Method": 1,
      "Params": "Ynl0ZSBhcnJheQ==",
-      "ParamsCodec": 42
+      "CID": {
+        "/": "bafy2bzacebbpdegvr3i4cosewthysg5xkxpqfn2wfcz6mv2hmoktwbdxkax4s"
+      }
    },
    "MsgRct": {
      "ExitCode": 0,
      "Return": "Ynl0ZSBhcnJheQ==",
-      "ReturnCodec": 42
+      "GasUsed": 9,
+      "EventsRoot": {
+        "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+      }
    },
+    "Error": "string value",
+    "Duration": 60000000000,
    "GasCharges": [
      {
        "Name": "string value",
+        "loc": [
+          {
+            "File": "string value",
+            "Line": 123,
+            "Function": "string value"
+          }
+        ],
        "tg": 9,
        "cg": 9,
        "sg": 9,
-        "tt": 60000000000
+        "vtg": 9,
+        "vcg": 9,
+        "vsg": 9,
+        "tt": 60000000000,
+        "ex": {}
      }
    ],
    "Subcalls": [
      {
        "Msg": {
-          "From": "f01234",
+          "Version": 42,
          "To": "f01234",
+          "From": "f01234",
+          "Nonce": 42,
          "Value": "0",
+          "GasLimit": 9,
+          "GasFeeCap": "0",
+          "GasPremium": "0",
          "Method": 1,
          "Params": "Ynl0ZSBhcnJheQ==",
-          "ParamsCodec": 42
+          "CID": {
+            "/": "bafy2bzacebbpdegvr3i4cosewthysg5xkxpqfn2wfcz6mv2hmoktwbdxkax4s"
+          }
        },
        "MsgRct": {
          "ExitCode": 0,
          "Return": "Ynl0ZSBhcnJheQ==",
-          "ReturnCodec": 42
+          "GasUsed": 9,
+          "EventsRoot": {
+            "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+          }
        },
+        "Error": "string value",
+        "Duration": 60000000000,
        "GasCharges": [
          {
            "Name": "string value",
+            "loc": [
+              {
+                "File": "string value",
+                "Line": 123,
+                "Function": "string value"
+              }
+            ],
            "tg": 9,
            "cg": 9,
            "sg": 9,
-            "tt": 60000000000
+            "vtg": 9,
+            "vcg": 9,
+            "vsg": 9,
+            "tt": 60000000000,
+            "ex": {}
          }
        ],
        "Subcalls": null
@@ -5096,49 +5142,95 @@ Response:
      },
      "ExecutionTrace": {
        "Msg": {
-          "From": "f01234",
+          "Version": 42,
          "To": "f01234",
+          "From": "f01234",
+          "Nonce": 42,
          "Value": "0",
+          "GasLimit": 9,
+          "GasFeeCap": "0",
+          "GasPremium": "0",
          "Method": 1,
          "Params": "Ynl0ZSBhcnJheQ==",
-          "ParamsCodec": 42
+          "CID": {
+            "/": "bafy2bzacebbpdegvr3i4cosewthysg5xkxpqfn2wfcz6mv2hmoktwbdxkax4s"
+          }
        },
        "MsgRct": {
          "ExitCode": 0,
          "Return": "Ynl0ZSBhcnJheQ==",
-          "ReturnCodec": 42
+          "GasUsed": 9,
+          "EventsRoot": {
+            "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+          }
        },
+        "Error": "string value",
+        "Duration": 60000000000,
        "GasCharges": [
          {
            "Name": "string value",
+            "loc": [
+              {
+                "File": "string value",
+                "Line": 123,
+                "Function": "string value"
+              }
+            ],
            "tg": 9,
            "cg": 9,
            "sg": 9,
-            "tt": 60000000000
+            "vtg": 9,
+            "vcg": 9,
+            "vsg": 9,
+            "tt": 60000000000,
+            "ex": {}
          }
        ],
        "Subcalls": [
          {
            "Msg": {
-              "From": "f01234",
+              "Version": 42,
              "To": "f01234",
+              "From": "f01234",
+              "Nonce": 42,
              "Value": "0",
+              "GasLimit": 9,
+              "GasFeeCap": "0",
+              "GasPremium": "0",
              "Method": 1,
              "Params": "Ynl0ZSBhcnJheQ==",
-              "ParamsCodec": 42
+              "CID": {
+                "/": "bafy2bzacebbpdegvr3i4cosewthysg5xkxpqfn2wfcz6mv2hmoktwbdxkax4s"
+              }
            },
            "MsgRct": {
              "ExitCode": 0,
              "Return": "Ynl0ZSBhcnJheQ==",
-              "ReturnCodec": 42
+              "GasUsed": 9,
+              "EventsRoot": {
+                "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+              }
            },
+            "Error": "string value",
+            "Duration": 60000000000,
            "GasCharges": [
              {
                "Name": "string value",
+                "loc": [
+                  {
+                    "File": "string value",
+                    "Line": 123,
+                    "Function": "string value"
+                  }
+                ],
                "tg": 9,
                "cg": 9,
                "sg": 9,
-                "tt": 60000000000
+                "vtg": 9,
+                "vcg": 9,
+                "vsg": 9,
+                "tt": 60000000000,
+                "ex": {}
              }
            ],
            "Subcalls": null
@@ -5442,9 +5534,7 @@ Response:
    "UpgradeOhSnapHeight": 10101,
    "UpgradeSkyrHeight": 10101,
    "UpgradeSharkHeight": 10101,
-    "UpgradeHyggeHeight": 10101,
-    "UpgradeLightningHeight": 10101,
-    "UpgradeThunderHeight": 10101
+    "UpgradeHyggeHeight": 10101
  }
 }
 ```
@@ -6484,49 +6574,95 @@ Response:
  },
  "ExecutionTrace": {
    "Msg": {
-      "From": "f01234",
+      "Version": 42,
      "To": "f01234",
+      "From": "f01234",
+      "Nonce": 42,
      "Value": "0",
+      "GasLimit": 9,
+      "GasFeeCap": "0",
+      "GasPremium": "0",
      "Method": 1,
      "Params": "Ynl0ZSBhcnJheQ==",
-      "ParamsCodec": 42
+      "CID": {
+        "/": "bafy2bzacebbpdegvr3i4cosewthysg5xkxpqfn2wfcz6mv2hmoktwbdxkax4s"
+      }
    },
    "MsgRct": {
      "ExitCode": 0,
      "Return": "Ynl0ZSBhcnJheQ==",
-      "ReturnCodec": 42
+      "GasUsed": 9,
+      "EventsRoot": {
+        "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+      }
    },
+    "Error": "string value",
+    "Duration": 60000000000,
    "GasCharges": [
      {
        "Name": "string value",
+        "loc": [
+          {
+            "File": "string value",
+            "Line": 123,
+            "Function": "string value"
+          }
+        ],
        "tg": 9,
        "cg": 9,
        "sg": 9,
-        "tt": 60000000000
+        "vtg": 9,
+        "vcg": 9,
+        "vsg": 9,
+        "tt": 60000000000,
+        "ex": {}
      }
    ],
    "Subcalls": [
      {
        "Msg": {
-          "From": "f01234",
+          "Version": 42,
          "To": "f01234",
+          "From": "f01234",
+          "Nonce": 42,
          "Value": "0",
+          "GasLimit": 9,
+          "GasFeeCap": "0",
+          "GasPremium": "0",
          "Method": 1,
          "Params": "Ynl0ZSBhcnJheQ==",
-          "ParamsCodec": 42
+          "CID": {
+            "/": "bafy2bzacebbpdegvr3i4cosewthysg5xkxpqfn2wfcz6mv2hmoktwbdxkax4s"
+          }
        },
        "MsgRct": {
          "ExitCode": 0,
          "Return": "Ynl0ZSBhcnJheQ==",
-          "ReturnCodec": 42
+          "GasUsed": 9,
+          "EventsRoot": {
+            "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+          }
        },
+        "Error": "string value",
+        "Duration": 60000000000,
        "GasCharges": [
          {
            "Name": "string value",
+            "loc": [
+              {
+                "File": "string value",
+                "Line": 123,
+                "Function": "string value"
+              }
+            ],
            "tg": 9,
            "cg": 9,
            "sg": 9,
-            "tt": 60000000000
+            "vtg": 9,
+            "vcg": 9,
+            "vsg": 9,
+            "tt": 60000000000,
+            "ex": {}
          }
        ],
        "Subcalls": null
@@ -6136,49 +6136,95 @@ Response:
  },
  "ExecutionTrace": {
    "Msg": {
-      "From": "f01234",
+      "Version": 42,
      "To": "f01234",
+      "From": "f01234",
+      "Nonce": 42,
      "Value": "0",
+      "GasLimit": 9,
+      "GasFeeCap": "0",
+      "GasPremium": "0",
      "Method": 1,
      "Params": "Ynl0ZSBhcnJheQ==",
-      "ParamsCodec": 42
+      "CID": {
+        "/": "bafy2bzacebbpdegvr3i4cosewthysg5xkxpqfn2wfcz6mv2hmoktwbdxkax4s"
+      }
    },
    "MsgRct": {
      "ExitCode": 0,
      "Return": "Ynl0ZSBhcnJheQ==",
-      "ReturnCodec": 42
+      "GasUsed": 9,
+      "EventsRoot": {
+        "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+      }
    },
+    "Error": "string value",
+    "Duration": 60000000000,
    "GasCharges": [
      {
        "Name": "string value",
+        "loc": [
+          {
+            "File": "string value",
+            "Line": 123,
+            "Function": "string value"
+          }
+        ],
        "tg": 9,
        "cg": 9,
        "sg": 9,
-        "tt": 60000000000
+        "vtg": 9,
+        "vcg": 9,
+        "vsg": 9,
+        "tt": 60000000000,
+        "ex": {}
      }
    ],
    "Subcalls": [
      {
        "Msg": {
-          "From": "f01234",
+          "Version": 42,
          "To": "f01234",
+          "From": "f01234",
+          "Nonce": 42,
          "Value": "0",
+          "GasLimit": 9,
+          "GasFeeCap": "0",
+          "GasPremium": "0",
          "Method": 1,
          "Params": "Ynl0ZSBhcnJheQ==",
-          "ParamsCodec": 42
+          "CID": {
+            "/": "bafy2bzacebbpdegvr3i4cosewthysg5xkxpqfn2wfcz6mv2hmoktwbdxkax4s"
+          }
        },
        "MsgRct": {
          "ExitCode": 0,
          "Return": "Ynl0ZSBhcnJheQ==",
-          "ReturnCodec": 42
+          "GasUsed": 9,
+          "EventsRoot": {
+            "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+          }
        },
+        "Error": "string value",
+        "Duration": 60000000000,
        "GasCharges": [
          {
            "Name": "string value",
+            "loc": [
+              {
+                "File": "string value",
+                "Line": 123,
+                "Function": "string value"
+              }
+            ],
            "tg": 9,
            "cg": 9,
            "sg": 9,
-            "tt": 60000000000
+            "vtg": 9,
+            "vcg": 9,
+            "vsg": 9,
+            "tt": 60000000000,
+            "ex": {}
          }
        ],
        "Subcalls": null
@@ -6366,49 +6412,95 @@ Response:
      },
      "ExecutionTrace": {
        "Msg": {
-          "From": "f01234",
+          "Version": 42,
          "To": "f01234",
+          "From": "f01234",
+          "Nonce": 42,
          "Value": "0",
+          "GasLimit": 9,
+          "GasFeeCap": "0",
+          "GasPremium": "0",
          "Method": 1,
          "Params": "Ynl0ZSBhcnJheQ==",
-          "ParamsCodec": 42
+          "CID": {
+            "/": "bafy2bzacebbpdegvr3i4cosewthysg5xkxpqfn2wfcz6mv2hmoktwbdxkax4s"
+          }
        },
        "MsgRct": {
          "ExitCode": 0,
          "Return": "Ynl0ZSBhcnJheQ==",
-          "ReturnCodec": 42
+          "GasUsed": 9,
+          "EventsRoot": {
+            "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+          }
        },
+        "Error": "string value",
+        "Duration": 60000000000,
        "GasCharges": [
          {
            "Name": "string value",
+            "loc": [
+              {
+                "File": "string value",
+                "Line": 123,
+                "Function": "string value"
+              }
+            ],
            "tg": 9,
            "cg": 9,
            "sg": 9,
-            "tt": 60000000000
+            "vtg": 9,
+            "vcg": 9,
+            "vsg": 9,
+            "tt": 60000000000,
+            "ex": {}
          }
        ],
        "Subcalls": [
          {
            "Msg": {
-              "From": "f01234",
+              "Version": 42,
              "To": "f01234",
+              "From": "f01234",
+              "Nonce": 42,
              "Value": "0",
+              "GasLimit": 9,
+              "GasFeeCap": "0",
+              "GasPremium": "0",
              "Method": 1,
              "Params": "Ynl0ZSBhcnJheQ==",
-              "ParamsCodec": 42
+              "CID": {
+                "/": "bafy2bzacebbpdegvr3i4cosewthysg5xkxpqfn2wfcz6mv2hmoktwbdxkax4s"
+              }
            },
            "MsgRct": {
              "ExitCode": 0,
              "Return": "Ynl0ZSBhcnJheQ==",
-              "ReturnCodec": 42
+              "GasUsed": 9,
+              "EventsRoot": {
+                "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+              }
            },
+            "Error": "string value",
+            "Duration": 60000000000,
            "GasCharges": [
              {
                "Name": "string value",
+                "loc": [
+                  {
+                    "File": "string value",
+                    "Line": 123,
+                    "Function": "string value"
+                  }
+                ],
                "tg": 9,
                "cg": 9,
                "sg": 9,
-                "tt": 60000000000
+                "vtg": 9,
+                "vcg": 9,
+                "vsg": 9,
+                "tt": 60000000000,
+                "ex": {}
              }
            ],
            "Subcalls": null
@@ -6787,9 +6879,7 @@ Response:
    "UpgradeOhSnapHeight": 10101,
    "UpgradeSkyrHeight": 10101,
    "UpgradeSharkHeight": 10101,
-    "UpgradeHyggeHeight": 10101,
-    "UpgradeLightningHeight": 10101,
-    "UpgradeThunderHeight": 10101
+    "UpgradeHyggeHeight": 10101
  }
 }
 ```
@@ -7837,49 +7927,95 @@ Response:
  },
  "ExecutionTrace": {
    "Msg": {
-      "From": "f01234",
+      "Version": 42,
      "To": "f01234",
+      "From": "f01234",
+      "Nonce": 42,
      "Value": "0",
+      "GasLimit": 9,
+      "GasFeeCap": "0",
+      "GasPremium": "0",
      "Method": 1,
      "Params": "Ynl0ZSBhcnJheQ==",
-      "ParamsCodec": 42
+      "CID": {
+        "/": "bafy2bzacebbpdegvr3i4cosewthysg5xkxpqfn2wfcz6mv2hmoktwbdxkax4s"
+      }
    },
    "MsgRct": {
      "ExitCode": 0,
      "Return": "Ynl0ZSBhcnJheQ==",
-      "ReturnCodec": 42
+      "GasUsed": 9,
+      "EventsRoot": {
+        "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+      }
    },
+    "Error": "string value",
+    "Duration": 60000000000,
    "GasCharges": [
      {
        "Name": "string value",
+        "loc": [
+          {
+            "File": "string value",
+            "Line": 123,
+            "Function": "string value"
+          }
+        ],
        "tg": 9,
        "cg": 9,
        "sg": 9,
-        "tt": 60000000000
+        "vtg": 9,
+        "vcg": 9,
+        "vsg": 9,
+        "tt": 60000000000,
+        "ex": {}
      }
    ],
    "Subcalls": [
      {
        "Msg": {
-          "From": "f01234",
+          "Version": 42,
          "To": "f01234",
+          "From": "f01234",
+          "Nonce": 42,
          "Value": "0",
+          "GasLimit": 9,
+          "GasFeeCap": "0",
+          "GasPremium": "0",
          "Method": 1,
          "Params": "Ynl0ZSBhcnJheQ==",
-          "ParamsCodec": 42
+          "CID": {
+            "/": "bafy2bzacebbpdegvr3i4cosewthysg5xkxpqfn2wfcz6mv2hmoktwbdxkax4s"
+          }
        },
        "MsgRct": {
          "ExitCode": 0,
          "Return": "Ynl0ZSBhcnJheQ==",
-          "ReturnCodec": 42
+          "GasUsed": 9,
+          "EventsRoot": {
+            "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+          }
        },
+        "Error": "string value",
+        "Duration": 60000000000,
        "GasCharges": [
          {
            "Name": "string value",
+            "loc": [
+              {
+                "File": "string value",
+                "Line": 123,
+                "Function": "string value"
+              }
+            ],
            "tg": 9,
            "cg": 9,
            "sg": 9,
-            "tt": 60000000000
+            "vtg": 9,
+            "vcg": 9,
+            "vsg": 9,
+            "tt": 60000000000,
+            "ex": {}
          }
        ],
        "Subcalls": null
@@ -7,7 +7,7 @@ USAGE:
   lotus-miner [global options] command [command options] [arguments...]

 VERSION:
-   1.22.0-rc4
+   1.20.3

 COMMANDS:
   init     Initialize a lotus miner repo
@@ -7,7 +7,7 @@ USAGE:
   lotus-worker [global options] command [command options] [arguments...]

 VERSION:
-   1.22.0-rc4
+   1.20.3

 COMMANDS:
   run         Start lotus worker
@@ -7,7 +7,7 @@ USAGE:
   lotus [global options] command [command options] [arguments...]

 VERSION:
-   1.22.0-rc4
+   1.20.3

 COMMANDS:
   daemon   Start a lotus daemon process
@@ -4,9 +4,11 @@
 - [ ] Define upgrade heights in `build/params_`
 - [ ] Generate adapters
  - [ ] Update `gen/inlinegen-data.json`
+  - [ ] Update `chain/actors/version.go`
  - [ ] Update adapter code in `chain/actors/builtin` if needed
  - [ ] Run `make actors-gen`
 - [ ] Update `chain/consensus/filcns/upgrades.go`
  - [ ] Schedule
  - [ ] Migration
+- [ ] Update upgrade schedule in `chain/sync_test.go`
 - [ ] Add upgrade field to `api/types.go/ForkUpgradeParams` and update the implementation of StateGetNetworkParams
@@ -21,7 +21,7 @@ import (
 )

 func (gw *Node) Web3ClientVersion(ctx context.Context) (string, error) {
-	if err := gw.limit(ctx, stateRateLimitTokens); err != nil {
+	if err := gw.limit(ctx, basicRateLimitTokens); err != nil {
 		return "", err
 	}

@@ -34,7 +34,7 @@ func (gw *Node) EthAccounts(ctx context.Context) ([]ethtypes.EthAddress, error)
 }

 func (gw *Node) EthBlockNumber(ctx context.Context) (ethtypes.EthUint64, error) {
-	if err := gw.limit(ctx, stateRateLimitTokens); err != nil {
+	if err := gw.limit(ctx, chainRateLimitTokens); err != nil {
 		return 0, err
 	}

@@ -109,11 +109,7 @@ func (gw *Node) checkBlkParam(ctx context.Context, blkParam string) error {
 }

 func (gw *Node) EthGetBlockTransactionCountByHash(ctx context.Context, blkHash ethtypes.EthHash) (ethtypes.EthUint64, error) {
-	if err := gw.limit(ctx, stateRateLimitTokens); err != nil {
-		return 0, err
-	}
-
-	if err := gw.checkBlkHash(ctx, blkHash); err != nil {
+	if err := gw.limit(ctx, chainRateLimitTokens); err != nil {
 		return 0, err
 	}

@@ -161,7 +157,7 @@ func (gw *Node) EthGetTransactionHashByCid(ctx context.Context, cid cid.Cid) (*e
 }

 func (gw *Node) EthGetMessageCidByTransactionHash(ctx context.Context, txHash *ethtypes.EthHash) (*cid.Cid, error) {
-	if err := gw.limit(ctx, stateRateLimitTokens); err != nil {
+	if err := gw.limit(ctx, chainRateLimitTokens); err != nil {
 		return nil, err
 	}

@@ -188,34 +184,6 @@ func (gw *Node) EthGetTransactionReceipt(ctx context.Context, txHash ethtypes.Et
 	return gw.target.EthGetTransactionReceipt(ctx, txHash)
 }

-func (gw *Node) EthGetTransactionByBlockHashAndIndex(ctx context.Context, blkHash ethtypes.EthHash, txIndex ethtypes.EthUint64) (ethtypes.EthTx, error) {
-	if err := gw.limit(ctx, stateRateLimitTokens); err != nil {
-		return ethtypes.EthTx{}, err
-	}
-
-	if err := gw.checkBlkHash(ctx, blkHash); err != nil {
-		return ethtypes.EthTx{}, err
-	}
-
-	return gw.target.EthGetTransactionByBlockHashAndIndex(ctx, blkHash, txIndex)
-}
-
-func (gw *Node) EthGetTransactionByBlockNumberAndIndex(ctx context.Context, blkNum ethtypes.EthUint64, txIndex ethtypes.EthUint64) (ethtypes.EthTx, error) {
-	if err := gw.limit(ctx, stateRateLimitTokens); err != nil {
-		return ethtypes.EthTx{}, err
-	}
-
-	head, err := gw.target.ChainHead(ctx)
-	if err != nil {
-		return ethtypes.EthTx{}, err
-	}
-	if err := gw.checkTipsetHeight(head, abi.ChainEpoch(blkNum)); err != nil {
-		return ethtypes.EthTx{}, err
-	}
-
-	return gw.target.EthGetTransactionByBlockNumberAndIndex(ctx, blkNum, txIndex)
-}
-
 func (gw *Node) EthGetCode(ctx context.Context, address ethtypes.EthAddress, blkOpt string) (ethtypes.EthBytes, error) {
 	if err := gw.limit(ctx, stateRateLimitTokens); err != nil {
 		return nil, err
@@ -253,7 +221,7 @@ func (gw *Node) EthGetBalance(ctx context.Context, address ethtypes.EthAddress,
 }

 func (gw *Node) EthChainId(ctx context.Context) (ethtypes.EthUint64, error) {
-	if err := gw.limit(ctx, stateRateLimitTokens); err != nil {
+	if err := gw.limit(ctx, basicRateLimitTokens); err != nil {
 		return 0, err
 	}

@@ -269,7 +237,7 @@ func (gw *Node) NetVersion(ctx context.Context) (string, error) {
 }

 func (gw *Node) NetListening(ctx context.Context) (bool, error) {
-	if err := gw.limit(ctx, stateRateLimitTokens); err != nil {
+	if err := gw.limit(ctx, basicRateLimitTokens); err != nil {
 		return false, err
 	}

@@ -285,7 +253,7 @@ func (gw *Node) EthProtocolVersion(ctx context.Context) (ethtypes.EthUint64, err
 }

 func (gw *Node) EthGasPrice(ctx context.Context) (ethtypes.EthBigInt, error) {
-	if err := gw.limit(ctx, stateRateLimitTokens); err != nil {
+	if err := gw.limit(ctx, chainRateLimitTokens); err != nil {
 		return ethtypes.EthBigInt(big.Zero()), err
 	}

@@ -316,7 +284,7 @@ func (gw *Node) EthFeeHistory(ctx context.Context, p jsonrpc.RawParams) (ethtype
 }

 func (gw *Node) EthMaxPriorityFeePerGas(ctx context.Context) (ethtypes.EthBigInt, error) {
-	if err := gw.limit(ctx, stateRateLimitTokens); err != nil {
+	if err := gw.limit(ctx, chainRateLimitTokens); err != nil {
 		return ethtypes.EthBigInt(big.Zero()), err
 	}

@@ -1,7 +1,7 @@
 {
-  "actorVersions": [0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11],
-  "latestActorsVersion":  11,
+  "actorVersions": [0, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+  "latestActorsVersion":  10,

-  "networkVersions": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20],
-  "latestNetworkVersion":  20
+  "networkVersions": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18],
+  "latestNetworkVersion":  18
 }
@@ -11,6 +11,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/exchange"
 	"github.com/filecoin-project/lotus/chain/market"
 	"github.com/filecoin-project/lotus/chain/types"
+	"github.com/filecoin-project/lotus/chain/vm"
 	"github.com/filecoin-project/lotus/cmd/lotus-shed/shedgen"
 	"github.com/filecoin-project/lotus/node/hello"
 	"github.com/filecoin-project/lotus/paychmgr"
@@ -36,11 +37,15 @@ func main() {
 		types.StateInfo0{},
 		types.Event{},
 		types.EventEntry{},
-		// Tracing
-		types.GasTrace{},
-		types.MessageTrace{},
-		types.ReturnTrace{},
-		types.ExecutionTrace{},
+	)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	err = gen.WriteTupleEncodersToFile("./chain/vm/cbor_gen.go", "vm",
+		vm.FvmExecutionTrace{},
+		vm.FvmGasCharge{},
 	)
 	if err != nil {
 		fmt.Println(err)
@@ -46,8 +46,8 @@ require (
 	github.com/filecoin-project/go-legs v0.4.4
 	github.com/filecoin-project/go-padreader v0.0.1
 	github.com/filecoin-project/go-paramfetch v0.0.4
-	github.com/filecoin-project/go-state-types v0.11.0-rc2
-	github.com/filecoin-project/go-statemachine v1.0.3
+	github.com/filecoin-project/go-state-types v0.10.0
+	github.com/filecoin-project/go-statemachine v1.0.2
 	github.com/filecoin-project/go-statestore v0.2.0
 	github.com/filecoin-project/go-storedcounter v0.1.0
 	github.com/filecoin-project/index-provider v0.9.1
@@ -158,11 +158,11 @@ require (
 	go.uber.org/fx v1.15.0
 	go.uber.org/multierr v1.8.0
 	go.uber.org/zap v1.23.0
-	golang.org/x/crypto v0.1.0
+	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
 	golang.org/x/exp v0.0.0-20220916125017-b168a2c6b86b
-	golang.org/x/net v0.1.0
+	golang.org/x/net v0.0.0-20220920183852-bf014ff85ad5
 	golang.org/x/sync v0.0.0-20220907140024-f12130a52804
-	golang.org/x/sys v0.1.0
+	golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8
 	golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9
 	golang.org/x/tools v0.1.12
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
@@ -340,8 +340,8 @@ require (
 	go.uber.org/dig v1.12.0 // indirect
 	go4.org v0.0.0-20200411211856-f5505b9728dd // indirect
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/term v0.1.0 // indirect
-	golang.org/x/text v0.4.0 // indirect
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
+	golang.org/x/text v0.3.7 // indirect
 	google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4 // indirect
 	google.golang.org/grpc v1.45.0 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
@@ -298,6 +298,7 @@ github.com/filecoin-project/dagstore v0.5.2 h1:Nd6oXdnolbbVhpMpkYT5PJHOjQp4OBSnt
 github.com/filecoin-project/dagstore v0.5.2/go.mod h1:mdqKzYrRBHf1pRMthYfMv3n37oOw0Tkx7+TxPt240M0=
 github.com/filecoin-project/go-address v0.0.3/go.mod h1:jr8JxKsYx+lQlQZmF5i2U0Z+cGQ59wMIps/8YW/lDj8=
 github.com/filecoin-project/go-address v0.0.5/go.mod h1:jr8JxKsYx+lQlQZmF5i2U0Z+cGQ59wMIps/8YW/lDj8=
+github.com/filecoin-project/go-address v0.0.6/go.mod h1:7B0/5DA13n6nHkB8bbGx1gWzG/dbTsZ0fgOJVGsM3TE=
 github.com/filecoin-project/go-address v1.1.0 h1:ofdtUtEsNxkIxkDw67ecSmvtzaVSdcea4boAmLbnHfE=
 github.com/filecoin-project/go-address v1.1.0/go.mod h1:5t3z6qPmIADZBtuE9EIzi0EwzcRy2nVhpo0I/c1r0OA=
 github.com/filecoin-project/go-amt-ipld/v2 v2.1.0 h1:t6qDiuGYYngDqaLc2ZUvdtAg4UNxPeOYaXhBWSNsVaM=
@@ -353,13 +354,13 @@ github.com/filecoin-project/go-state-types v0.0.0-20200928172055-2df22083d8ab/go
 github.com/filecoin-project/go-state-types v0.0.0-20201102161440-c8033295a1fc/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g=
 github.com/filecoin-project/go-state-types v0.1.0/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g=
 github.com/filecoin-project/go-state-types v0.1.6/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
+github.com/filecoin-project/go-state-types v0.1.8/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
 github.com/filecoin-project/go-state-types v0.1.10/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
-github.com/filecoin-project/go-state-types v0.11.0-rc1/go.mod h1:SyNPwTsU7I22gL2r0OAPcImvLoTVfgRwdK/Y5rR1zz8=
-github.com/filecoin-project/go-state-types v0.11.0-rc2 h1:zUx7aRxEGn56n4A1RS2J8FZzpzAozEMsqF11aXjtmkc=
-github.com/filecoin-project/go-state-types v0.11.0-rc2/go.mod h1:SyNPwTsU7I22gL2r0OAPcImvLoTVfgRwdK/Y5rR1zz8=
+github.com/filecoin-project/go-state-types v0.10.0 h1:vsSThZIaPmOxNGG59+8D/HnlWRtlbdOjduH6ye+v8f0=
+github.com/filecoin-project/go-state-types v0.10.0/go.mod h1:aLIas+W8BWAfpLWEPUOGMPBdhcVwoCG4pIQSQk26024=
 github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig=
-github.com/filecoin-project/go-statemachine v1.0.3 h1:N07o6alys+V1tNoSTi4WuuoeNC4erS/6jE74+NsgQuk=
-github.com/filecoin-project/go-statemachine v1.0.3/go.mod h1:jZdXXiHa61n4NmgWFG4w8tnqgvZVHYbJ3yW7+y8bF54=
+github.com/filecoin-project/go-statemachine v1.0.2 h1:421SSWBk8GIoCoWYYTE/d+qCWccgmRH0uXotXRDjUbc=
+github.com/filecoin-project/go-statemachine v1.0.2/go.mod h1:jZdXXiHa61n4NmgWFG4w8tnqgvZVHYbJ3yW7+y8bF54=
 github.com/filecoin-project/go-statestore v0.1.0/go.mod h1:LFc9hD+fRxPqiHiaqUEZOinUJB4WARkRfNl10O7kTnI=
 github.com/filecoin-project/go-statestore v0.2.0 h1:cRRO0aPLrxKQCZ2UOQbzFGn4WDNdofHZoGPjfNaAo5Q=
 github.com/filecoin-project/go-statestore v0.2.0/go.mod h1:8sjBYbS35HwPzct7iT4lIXjLlYyPor80aU7t7a/Kspo=
@@ -902,7 +903,6 @@ github.com/ipld/go-ipld-prime v0.11.0/go.mod h1:+WIAkokurHmZ/KwzDOMUuoeJgaRQktHt
 github.com/ipld/go-ipld-prime v0.14.0/go.mod h1:9ASQLwUFLptCov6lIYc70GRB4V7UTyLD0IJtrDJe6ZM=
 github.com/ipld/go-ipld-prime v0.16.0/go.mod h1:axSCuOCBPqrH+gvXr2w9uAOulJqBPhHPT2PjoiiU1qA=
 github.com/ipld/go-ipld-prime v0.17.0/go.mod h1:aYcKm5TIvGfY8P3QBKz/2gKcLxzJ1zDaD+o0bOowhgs=
-github.com/ipld/go-ipld-prime v0.19.0/go.mod h1:Q9j3BaVXwaA3o5JUDNvptDDr/x8+F7FG6XJ8WI3ILg4=
 github.com/ipld/go-ipld-prime v0.20.0 h1:Ud3VwE9ClxpO2LkCYP7vWPc0Fo+dYdYzgxUJZ3uRG4g=
 github.com/ipld/go-ipld-prime v0.20.0/go.mod h1:PzqZ/ZR981eKbgdr3y2DJYeD/8bgMawdGVlJDE8kK+M=
 github.com/ipld/go-ipld-prime-proto v0.0.0-20191113031812-e32bd156a1e5/go.mod h1:gcvzoEDBjwycpXt3LBE061wT9f46szXGHAmj9uoP6fU=
@@ -1527,7 +1527,6 @@ github.com/multiformats/go-multicodec v0.3.1-0.20210902112759-1539a079fd61/go.mo
 github.com/multiformats/go-multicodec v0.3.1-0.20211210143421-a526f306ed2c/go.mod h1:1Hj/eHRaVWSXiSNNfcEPcwZleTmdNP81xlxDLnWU9GQ=
 github.com/multiformats/go-multicodec v0.4.1/go.mod h1:1Hj/eHRaVWSXiSNNfcEPcwZleTmdNP81xlxDLnWU9GQ=
 github.com/multiformats/go-multicodec v0.5.0/go.mod h1:DiY2HFaEp5EhEXb/iYzVAunmyX/aSFMxq2KMKfWEues=
-github.com/multiformats/go-multicodec v0.6.0/go.mod h1:GUC8upxSBE4oG+q3kWZRw/+6yC1BqO550bjhWsJbZlw=
 github.com/multiformats/go-multicodec v0.8.0 h1:evBmgkbSQux+Ds2IgfhkO38Dl2GDtRW8/Rp6YiSHX/Q=
 github.com/multiformats/go-multicodec v0.8.0/go.mod h1:GUC8upxSBE4oG+q3kWZRw/+6yC1BqO550bjhWsJbZlw=
 github.com/multiformats/go-multihash v0.0.1/go.mod h1:w/5tugSrLEbWqlcgJabL3oHFKTwfvkofsjW2Qa1ct4U=
@@ -1922,7 +1921,6 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM=
 github.com/zondax/hid v0.9.1 h1:gQe66rtmyZ8VeGFcOpbuH3r7erYtNEAezCAYu8LdkJo=
 github.com/zondax/hid v0.9.1/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM=
@@ -2056,10 +2054,10 @@ golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210813211128-0a44fdfbc16e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
-golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -2170,9 +2168,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220418201149-a630d4f3e7a2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
-golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
+golang.org/x/net v0.0.0-20220920183852-bf014ff85ad5 h1:KafLifaRFIuSJ5C+7CyFJOF9haxKNC1CEIDk8GX6X0k=
+golang.org/x/net v0.0.0-20220920183852-bf014ff85ad5/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -2298,21 +2295,19 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210903071746-97244b99971b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211209171907-798191bca915/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
+golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw=
-golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -2320,9 +2315,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -2,6 +2,7 @@ package itests

 import (
 	"context"
+	"strconv"
 	"testing"
 	"time"

@@ -9,6 +10,7 @@ import (

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

+	"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/chain/wallet/key"
@@ -109,3 +111,16 @@ func TestEthGetGenesis(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, ethBlk.Hash, genesisHash)
 }
+
+func TestNetVersion(t *testing.T) {
+	blockTime := 100 * time.Millisecond
+	client, _, ens := kit.EnsembleMinimal(t, kit.MockProofs(), kit.ThroughRPC())
+	ens.InterconnectAll().BeginMining(blockTime)
+
+	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
+	defer cancel()
+
+	version, err := client.NetVersion(ctx)
+	require.NoError(t, err)
+	require.Equal(t, strconv.Itoa(build.Eip155ChainId), version)
+}
@@ -49,9 +49,6 @@ func TestEthBlockHashesCorrect_MultiBlockTipset(t *testing.T) {
 	// let the chain run a little bit longer to minimise the chance of reorgs
 	n2.WaitTillChain(ctx, kit.HeightAtLeast(head.Height()+50))

-	head, err = n2.ChainHead(context.Background())
-	require.NoError(t, err)
-
 	for i := 1; i <= int(head.Height()); i++ {
 		hex := fmt.Sprintf("0x%x", i)

@@ -236,14 +236,6 @@ func TestEthOpenRPCConformance(t *testing.T) {
 			skipReason: "earliest block is not supported",
 		},

-		{
-			method:  "eth_getBlockByNumber",
-			variant: "pending",
-			call: func(a *ethAPIRaw) (json.RawMessage, error) {
-				return ethapi.EthGetBlockByNumber(context.Background(), "pending", true)
-			},
-		},
-
 		{
 			method: "eth_getBlockByNumber",
 			call: func(a *ethAPIRaw) (json.RawMessage, error) {
@@ -38,17 +38,16 @@ func SDRUpgradeAt(calico, persian abi.ChainEpoch) EnsembleOpt {
 }

 func LatestActorsAt(upgradeHeight abi.ChainEpoch) EnsembleOpt {
-	// TODO: nv19: Re-enable when migration is setup
-	///* inline-gen template
-	//	return UpgradeSchedule(stmgr.Upgrade{
-	//		Network: network.Version{{add .latestNetworkVersion -1}},
-	//		Height:  -1,
-	//	}, stmgr.Upgrade{
-	//		Network:   network.Version{{.latestNetworkVersion}},
-	//		Height:    upgradeHeight,
-	//		Migration: filcns.UpgradeActorsV{{.latestActorsVersion}},
-	//	})
-	///* inline-gen start */
+	/* inline-gen template
+		return UpgradeSchedule(stmgr.Upgrade{
+			Network: network.Version{{add .latestNetworkVersion -1}},
+			Height:  -1,
+		}, stmgr.Upgrade{
+			Network:   network.Version{{.latestNetworkVersion}},
+			Height:    upgradeHeight,
+			Migration: filcns.UpgradeActorsV{{.latestActorsVersion}},
+		})
+	/* inline-gen start */
 	return UpgradeSchedule(stmgr.Upgrade{
 		Network: network.Version17,
 		Height:  -1,
@@ -57,7 +56,7 @@ func LatestActorsAt(upgradeHeight abi.ChainEpoch) EnsembleOpt {
 		Height:    upgradeHeight,
 		Migration: filcns.UpgradeActorsV10,
 	})
-	///* inline-gen end */
+	/* inline-gen end */
 }

 func TurboUpgradeAt(upgradeHeight abi.ChainEpoch) EnsembleOpt {
@@ -11,26 +11,19 @@ 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/big"
 	"github.com/filecoin-project/go-state-types/builtin"
-	miner11 "github.com/filecoin-project/go-state-types/builtin/v11/miner"
-	power11 "github.com/filecoin-project/go-state-types/builtin/v11/power"
-	adt11 "github.com/filecoin-project/go-state-types/builtin/v11/util/adt"
 	markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market"
 	migration "github.com/filecoin-project/go-state-types/builtin/v9/migration/test"
 	miner9 "github.com/filecoin-project/go-state-types/builtin/v9/miner"
 	verifregst "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
 	"github.com/filecoin-project/go-state-types/crypto"
-	"github.com/filecoin-project/go-state-types/manifest"
 	"github.com/filecoin-project/go-state-types/network"
 	gstStore "github.com/filecoin-project/go-state-types/store"

 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/blockstore"
-	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/actors"
-	builtin2 "github.com/filecoin-project/lotus/chain/actors/builtin"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/datacap"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/market"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
@@ -39,8 +32,6 @@ import (
 	"github.com/filecoin-project/lotus/chain/state"
 	"github.com/filecoin-project/lotus/chain/stmgr"
 	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/filecoin-project/lotus/chain/types/ethtypes"
-	"github.com/filecoin-project/lotus/chain/vm"
 	"github.com/filecoin-project/lotus/chain/wallet/key"
 	"github.com/filecoin-project/lotus/itests/kit"
 	"github.com/filecoin-project/lotus/node/impl"
@@ -529,236 +520,3 @@ func TestMigrationNV17(t *testing.T) {

 	require.Nil(t, dc)
 }
-
-func TestMigrationNV18(t *testing.T) {
-	kit.QuietMiningLogs()
-
-	nv18epoch := abi.ChainEpoch(100)
-	testClient, _, ens := kit.EnsembleMinimal(t, kit.MockProofs(),
-		kit.UpgradeSchedule(stmgr.Upgrade{
-			Network: network.Version17,
-			Height:  -1,
-		}, stmgr.Upgrade{
-			Network:   network.Version18,
-			Height:    nv18epoch,
-			Migration: filcns.UpgradeActorsV10,
-		},
-		))
-
-	ens.InterconnectAll().BeginMining(10 * time.Millisecond)
-
-	clientApi := testClient.FullNode.(*impl.FullNodeAPI)
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	testClient.WaitTillChain(ctx, kit.HeightAtLeast(nv18epoch+5))
-
-	// Now that we have upgraded, we need to:
-	// - the EAM exists, has "empty" state
-	// - the EthZeroAddress exists
-	// - all actors have nil Address fields
-
-	bs := blockstore.NewAPIBlockstore(testClient)
-	ctxStore := gstStore.WrapBlockStore(ctx, bs)
-
-	currTs, err := clientApi.ChainHead(ctx)
-	require.NoError(t, err)
-
-	newStateTree, err := state.LoadStateTree(ctxStore, currTs.Blocks()[0].ParentStateRoot)
-	require.NoError(t, err)
-
-	require.Equal(t, types.StateTreeVersion5, newStateTree.Version())
-
-	codeIDsv10, ok := actors.GetActorCodeIDsFromManifest(actorstypes.Version10)
-	require.True(t, ok)
-
-	// check the EAM actor
-	EAMActor, err := newStateTree.GetActor(builtin.EthereumAddressManagerActorAddr)
-	require.NoError(t, err)
-	require.Equal(t, vm.EmptyObjectCid, EAMActor.Head)
-	EAMCodeID, ok := codeIDsv10[manifest.EamKey]
-	require.True(t, ok)
-	require.Equal(t, EAMCodeID, EAMActor.Code)
-
-	// check the EthZeroAddress
-	ethZeroAddr, err := (ethtypes.EthAddress{}).ToFilecoinAddress()
-	require.NoError(t, err)
-	ethZeroAddrID, err := newStateTree.LookupID(ethZeroAddr)
-	require.NoError(t, err)
-	ethZeroActor, err := newStateTree.GetActor(ethZeroAddrID)
-	require.NoError(t, err)
-	require.True(t, builtin2.IsEthAccountActor(ethZeroActor.Code))
-	require.Equal(t, vm.EmptyObjectCid, ethZeroActor.Head)
-
-	// check all actor's Address fields
-	require.NoError(t, newStateTree.ForEach(func(address address.Address, actor *types.Actor) error {
-		if address != ethZeroAddrID {
-			require.Nil(t, actor.Address)
-		}
-		return nil
-	}))
-}
-
-func TestMigrationNV19(t *testing.T) {
-	kit.QuietMiningLogs()
-
-	blockTime := 5 * time.Millisecond
-	nv19epoch := abi.ChainEpoch(100)
-	nv20epoch := nv19epoch + builtin.EpochsInDay
-	testClient, testMiner, ens := kit.EnsembleMinimal(t, kit.MockProofs(),
-		kit.UpgradeSchedule(stmgr.Upgrade{
-			Network: network.Version18,
-			Height:  -1,
-		}, stmgr.Upgrade{
-			Network:   network.Version19,
-			Height:    nv19epoch,
-			Migration: filcns.UpgradeActorsV11,
-		}, stmgr.Upgrade{
-			Network:   network.Version20,
-			Height:    nv20epoch,
-			Migration: nil,
-		},
-		))
-
-	ens.InterconnectAll().BeginMining(blockTime)
-
-	clientApi := testClient.FullNode.(*impl.FullNodeAPI)
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	testClient.WaitTillChain(ctx, kit.HeightAtLeast(nv19epoch+5))
-
-	bs := blockstore.NewAPIBlockstore(testClient)
-	ctxStore := gstStore.WrapBlockStore(ctx, bs)
-
-	postMigrationTs, err := clientApi.ChainHead(ctx)
-	require.NoError(t, err)
-
-	newStateTree, err := state.LoadStateTree(ctxStore, postMigrationTs.Blocks()[0].ParentStateRoot)
-	require.NoError(t, err)
-
-	require.Equal(t, types.StateTreeVersion5, newStateTree.Version())
-
-	// Now that we have upgraded, we need to check that:
-
-	// - a PoSt is successfully submitted in nv19
-	// - a PoSt is successfully submitted in nv20
-	// - all claims in the Power actor are of v1_1 type
-	// - the miner's info has been updated to the v1_1 type
-
-	// Wait for an nv19 PoSt
-
-	mi, err := testClient.StateMinerInfo(ctx, testMiner.ActorAddr, types.EmptyTSK)
-	require.NoError(t, err)
-
-	wact19, err := testClient.StateGetActor(ctx, mi.Worker, types.EmptyTSK)
-	require.NoError(t, err)
-	en19 := wact19.Nonce
-
-	// wait for a new message to be sent from worker address, it will be a PoSt
-
-waitForProof19:
-	for {
-		//stm: @CHAIN_STATE_GET_ACTOR_001
-		wact, err := testClient.StateGetActor(ctx, mi.Worker, types.EmptyTSK)
-		require.NoError(t, err)
-		if wact.Nonce > en19 {
-			break waitForProof19
-		}
-
-		build.Clock.Sleep(blockTime)
-	}
-
-	slm19, err := testClient.StateListMessages(ctx, &api.MessageMatch{To: testMiner.ActorAddr}, types.EmptyTSK, 0)
-	require.NoError(t, err)
-
-	pmr19, err := testClient.StateSearchMsg(ctx, types.EmptyTSK, slm19[0], -1, false)
-	require.NoError(t, err)
-
-	nv19, err := testClient.StateNetworkVersion(ctx, pmr19.TipSet)
-	require.NoError(t, err)
-	require.Equal(t, network.Version19, nv19)
-
-	require.True(t, pmr19.Receipt.ExitCode.IsSuccess())
-
-	slmsg19, err := testClient.ChainGetMessage(ctx, slm19[0])
-	require.NoError(t, err)
-
-	var params19 miner11.SubmitWindowedPoStParams
-	require.NoError(t, params19.UnmarshalCBOR(bytes.NewBuffer(slmsg19.Params)))
-	require.Equal(t, abi.RegisteredPoStProof_StackedDrgWindow2KiBV1_1, params19.Proofs[0].PoStProof)
-
-	// Wait for nv20
-
-	testClient.WaitTillChain(ctx, kit.HeightAtLeast(nv20epoch+5))
-
-	// Wait for an nv20 PoSt
-
-	wact20, err := testClient.StateGetActor(ctx, mi.Worker, types.EmptyTSK)
-	require.NoError(t, err)
-	en20 := wact20.Nonce
-
-	// wait for a new message to be sent from worker address, it will be a PoSt
-
-waitForProof20:
-	for {
-		//stm: @CHAIN_STATE_GET_ACTOR_001
-		wact, err := testClient.StateGetActor(ctx, mi.Worker, types.EmptyTSK)
-		require.NoError(t, err)
-		if wact.Nonce > en20 {
-			break waitForProof20
-		}
-
-		build.Clock.Sleep(blockTime)
-	}
-
-	slm20, err := testClient.StateListMessages(ctx, &api.MessageMatch{To: testMiner.ActorAddr}, types.EmptyTSK, 0)
-	require.NoError(t, err)
-
-	pmr20, err := testClient.StateSearchMsg(ctx, types.EmptyTSK, slm20[0], -1, false)
-	require.NoError(t, err)
-
-	nv20, err := testClient.StateNetworkVersion(ctx, pmr20.TipSet)
-	require.NoError(t, err)
-	require.Equal(t, network.Version20, nv20)
-
-	require.True(t, pmr20.Receipt.ExitCode.IsSuccess())
-
-	slmsg20, err := testClient.ChainGetMessage(ctx, slm20[0])
-	require.NoError(t, err)
-
-	var params20 miner11.SubmitWindowedPoStParams
-	require.NoError(t, params20.UnmarshalCBOR(bytes.NewBuffer(slmsg20.Params)))
-	require.Equal(t, abi.RegisteredPoStProof_StackedDrgWindow2KiBV1_1, params20.Proofs[0].PoStProof)
-
-	// check claims in the Power actor
-
-	powerActor, err := newStateTree.GetActor(builtin.StoragePowerActorAddr)
-	require.NoError(t, err)
-
-	var powerSt power11.State
-	require.NoError(t, ctxStore.Get(ctx, powerActor.Head, &powerSt))
-
-	powerClaims, err := adt11.AsMap(ctxStore, powerSt.Claims, builtin.DefaultHamtBitwidth)
-	require.NoError(t, err)
-
-	var claim power11.Claim
-	require.NoError(t, powerClaims.ForEach(&claim, func(key string) error {
-		v1proof, err := claim.WindowPoStProofType.ToV1_1PostProof()
-		require.NoError(t, err)
-
-		require.Equal(t, v1proof, claim.WindowPoStProofType)
-		return nil
-	}))
-
-	// check MinerInfo
-
-	minerInfo, err := testClient.StateMinerInfo(ctx, testMiner.ActorAddr, types.EmptyTSK)
-	require.NoError(t, err)
-
-	v1proof, err := minerInfo.WindowPoStProofType.ToV1_1PostProof()
-	require.NoError(t, err)
-
-	require.Equal(t, v1proof, minerInfo.WindowPoStProofType)
-
-}
@@ -0,0 +1,98 @@
+package itests
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+
+	"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/builtin"
+	"github.com/filecoin-project/go-state-types/manifest"
+	"github.com/filecoin-project/go-state-types/network"
+	gstStore "github.com/filecoin-project/go-state-types/store"
+
+	"github.com/filecoin-project/lotus/blockstore"
+	"github.com/filecoin-project/lotus/chain/actors"
+	builtin2 "github.com/filecoin-project/lotus/chain/actors/builtin"
+	"github.com/filecoin-project/lotus/chain/consensus/filcns"
+	"github.com/filecoin-project/lotus/chain/state"
+	"github.com/filecoin-project/lotus/chain/stmgr"
+	"github.com/filecoin-project/lotus/chain/types"
+	"github.com/filecoin-project/lotus/chain/types/ethtypes"
+	"github.com/filecoin-project/lotus/chain/vm"
+	"github.com/filecoin-project/lotus/itests/kit"
+	"github.com/filecoin-project/lotus/node/impl"
+)
+
+func TestMigrationNV18(t *testing.T) {
+	kit.QuietMiningLogs()
+
+	nv18epoch := abi.ChainEpoch(100)
+	testClient, _, ens := kit.EnsembleMinimal(t, kit.MockProofs(),
+		kit.UpgradeSchedule(stmgr.Upgrade{
+			Network: network.Version17,
+			Height:  -1,
+		}, stmgr.Upgrade{
+			Network:   network.Version18,
+			Height:    nv18epoch,
+			Migration: filcns.UpgradeActorsV10,
+		},
+		))
+
+	ens.InterconnectAll().BeginMining(10 * time.Millisecond)
+
+	clientApi := testClient.FullNode.(*impl.FullNodeAPI)
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	testClient.WaitTillChain(ctx, kit.HeightAtLeast(nv18epoch+5))
+
+	// Now that we have upgraded, we need to:
+	// - the EAM exists, has "empty" state
+	// - the EthZeroAddress exists
+	// - all actors have nil Address fields
+
+	bs := blockstore.NewAPIBlockstore(testClient)
+	ctxStore := gstStore.WrapBlockStore(ctx, bs)
+
+	currTs, err := clientApi.ChainHead(ctx)
+	require.NoError(t, err)
+
+	newStateTree, err := state.LoadStateTree(ctxStore, currTs.Blocks()[0].ParentStateRoot)
+	require.NoError(t, err)
+
+	require.Equal(t, types.StateTreeVersion5, newStateTree.Version())
+
+	codeIDsv10, ok := actors.GetActorCodeIDsFromManifest(actorstypes.Version10)
+	require.True(t, ok)
+
+	// check the EAM actor
+	EAMActor, err := newStateTree.GetActor(builtin.EthereumAddressManagerActorAddr)
+	require.NoError(t, err)
+	require.Equal(t, vm.EmptyObjectCid, EAMActor.Head)
+	EAMCodeID, ok := codeIDsv10[manifest.EamKey]
+	require.True(t, ok)
+	require.Equal(t, EAMCodeID, EAMActor.Code)
+
+	// check the EthZeroAddress
+	ethZeroAddr, err := (ethtypes.EthAddress{}).ToFilecoinAddress()
+	require.NoError(t, err)
+	ethZeroAddrID, err := newStateTree.LookupID(ethZeroAddr)
+	require.NoError(t, err)
+	ethZeroActor, err := newStateTree.GetActor(ethZeroAddrID)
+	require.NoError(t, err)
+	require.True(t, builtin2.IsEthAccountActor(ethZeroActor.Code))
+	require.Equal(t, vm.EmptyObjectCid, ethZeroActor.Head)
+
+	// check all actor's Address fields
+	require.NoError(t, newStateTree.ForEach(func(address address.Address, actor *types.Actor) error {
+		if address != ethZeroAddrID {
+			require.Nil(t, actor.Address)
+		}
+		return nil
+	}))
+}
@@ -2,7 +2,6 @@
 package itests

 import (
-	"bytes"
 	"context"
 	"fmt"
 	"testing"
@@ -13,7 +12,6 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
-	miner11 "github.com/filecoin-project/go-state-types/builtin/v11/miner"
 	"github.com/filecoin-project/go-state-types/network"

 	"github.com/filecoin-project/lotus/api"
@@ -345,143 +343,3 @@ waitForProof:

 	require.NotEqual(t, pmr.GasCost.BaseFeeBurn, big.Zero())
 }
-
-// Tests that V1_1 proofs are generated and accepted in nv19, and V1 proofs are accepted
-func TestWindowPostV1P1NV19(t *testing.T) {
-	kit.QuietMiningLogs()
-
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	blocktime := 2 * time.Millisecond
-
-	client, miner, ens := kit.EnsembleMinimal(t, kit.GenesisNetworkVersion(network.Version19))
-	ens.InterconnectAll().BeginMining(blocktime)
-
-	maddr, err := miner.ActorAddress(ctx)
-	require.NoError(t, err)
-
-	mi, err := client.StateMinerInfo(ctx, maddr, types.EmptyTSK)
-	require.NoError(t, err)
-
-	wact, err := client.StateGetActor(ctx, mi.Worker, types.EmptyTSK)
-	require.NoError(t, err)
-	en := wact.Nonce
-
-	// wait for a new message to be sent from worker address, it will be a PoSt
-
-waitForProof:
-	for {
-		wact, err := client.StateGetActor(ctx, mi.Worker, types.EmptyTSK)
-		require.NoError(t, err)
-		if wact.Nonce > en {
-			break waitForProof
-		}
-
-		build.Clock.Sleep(blocktime)
-	}
-
-	slm, err := client.StateListMessages(ctx, &api.MessageMatch{To: maddr}, types.EmptyTSK, 0)
-	require.NoError(t, err)
-
-	pmr, err := client.StateSearchMsg(ctx, types.EmptyTSK, slm[0], -1, false)
-	require.NoError(t, err)
-
-	inclTs, err := client.ChainGetTipSet(ctx, pmr.TipSet)
-	require.NoError(t, err)
-
-	nv, err := client.StateNetworkVersion(ctx, pmr.TipSet)
-	require.NoError(t, err)
-	require.Equal(t, network.Version19, nv)
-
-	require.True(t, pmr.Receipt.ExitCode.IsSuccess())
-
-	slmsg, err := client.ChainGetMessage(ctx, slm[0])
-	require.NoError(t, err)
-
-	var params miner11.SubmitWindowedPoStParams
-	require.NoError(t, params.UnmarshalCBOR(bytes.NewBuffer(slmsg.Params)))
-	require.Equal(t, abi.RegisteredPoStProof_StackedDrgWindow2KiBV1_1, params.Proofs[0].PoStProof)
-
-	// "Turn" this into a V1 proof -- the proof will be invalid, but won't be validated, and so the call should succeed
-	params.Proofs[0].PoStProof = abi.RegisteredPoStProof_StackedDrgWindow2KiBV1
-	v1PostParams := new(bytes.Buffer)
-	require.NoError(t, params.MarshalCBOR(v1PostParams))
-
-	slmsg.Params = v1PostParams.Bytes()
-
-	// Simulate call on inclTs's parents, so that the partition isn't already proven
-	call, err := client.StateCall(ctx, slmsg, inclTs.Parents())
-	require.NoError(t, err)
-	require.True(t, call.MsgRct.ExitCode.IsSuccess())
-}
-
-// Tests that V1_1 proofs are generated and accepted in nv20, and that V1 proofs are NOT
-func TestWindowPostV1P1NV20(t *testing.T) {
-	kit.QuietMiningLogs()
-
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	blocktime := 2 * time.Millisecond
-
-	client, miner, ens := kit.EnsembleMinimal(t, kit.GenesisNetworkVersion(network.Version20))
-	ens.InterconnectAll().BeginMining(blocktime)
-
-	maddr, err := miner.ActorAddress(ctx)
-	require.NoError(t, err)
-
-	mi, err := client.StateMinerInfo(ctx, maddr, types.EmptyTSK)
-	require.NoError(t, err)
-
-	wact, err := client.StateGetActor(ctx, mi.Worker, types.EmptyTSK)
-	require.NoError(t, err)
-	en := wact.Nonce
-
-	// wait for a new message to be sent from worker address, it will be a PoSt
-
-waitForProof:
-	for {
-		//stm: @CHAIN_STATE_GET_ACTOR_001
-		wact, err := client.StateGetActor(ctx, mi.Worker, types.EmptyTSK)
-		require.NoError(t, err)
-		if wact.Nonce > en {
-			break waitForProof
-		}
-
-		build.Clock.Sleep(blocktime)
-	}
-
-	slm, err := client.StateListMessages(ctx, &api.MessageMatch{To: maddr}, types.EmptyTSK, 0)
-	require.NoError(t, err)
-
-	pmr, err := client.StateSearchMsg(ctx, types.EmptyTSK, slm[0], -1, false)
-	require.NoError(t, err)
-
-	inclTs, err := client.ChainGetTipSet(ctx, pmr.TipSet)
-	require.NoError(t, err)
-
-	nv, err := client.StateNetworkVersion(ctx, pmr.TipSet)
-	require.NoError(t, err)
-	require.Equal(t, network.Version20, nv)
-
-	require.True(t, pmr.Receipt.ExitCode.IsSuccess())
-
-	slmsg, err := client.ChainGetMessage(ctx, slm[0])
-	require.NoError(t, err)
-
-	var params miner11.SubmitWindowedPoStParams
-	require.NoError(t, params.UnmarshalCBOR(bytes.NewBuffer(slmsg.Params)))
-	require.Equal(t, abi.RegisteredPoStProof_StackedDrgWindow2KiBV1_1, params.Proofs[0].PoStProof)
-
-	// "Turn" this into a V1 proof -- the proof will be invalid, but we won't get that far
-	params.Proofs[0].PoStProof = abi.RegisteredPoStProof_StackedDrgWindow2KiBV1
-	v1PostParams := new(bytes.Buffer)
-	require.NoError(t, params.MarshalCBOR(v1PostParams))
-
-	slmsg.Params = v1PostParams.Bytes()
-
-	// Simulate call on inclTs's parents, so that the partition isn't already proven
-	_, err = client.StateCall(ctx, slmsg, inclTs.Parents())
-	require.ErrorContains(t, err, "expected proof of type StackedDRGWindow2KiBV1P1, got StackedDRGWindow2KiBV1")
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
raulk	f656c18615	Merge pull request #10456 from filecoin-project/raulk/fix-eth-net_version	2023-03-13 11:51:29 +00:00
raulk	5accb588e9	Merge pull request #10445 from filecoin-project/steb/skip-tipset-execution	2023-03-13 11:51:16 +00:00
raulk	7d8b3053a2	Merge pull request #10409 from filecoin-project/asr/fix-eth-api-gateway fix: eth API: correct gateway restrictions, drop unimplemented methods	2023-03-13 11:50:56 +00:00
raulk	d4dc28cec9	Merge pull request #10446 from filecoin-project/steb/optimize-eth-block feat: eth: optimize eth block loading + eth_feeHistory	2023-03-13 11:41:48 +00:00