diff --git a/.circleci/config.yml b/.circleci/config.yml index 1a4c65f49..cb7756274 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -992,6 +992,8 @@ workflows: - build suite: itest-wdpost target: "./itests/wdpost_test.go" + get-params: true + - test: name: test-itest-wdpost_worker_config requires: diff --git a/.circleci/template.yml b/.circleci/template.yml index 32f50c161..382965615 100644 --- a/.circleci/template.yml +++ b/.circleci/template.yml @@ -547,6 +547,9 @@ workflows: [[- if or (eq $name "worker") (eq $name "deals_concurrent") (eq $name "wdpost_worker_config")]] executor: golang-2xl [[- end]] + [[- if (eq $name "wdpost")]] + get-params: true + [[end]] [[- end ]][[- end]] [[- range $suite, $pkgs := .UnitSuites]] diff --git a/build/openrpc/full.json.gz b/build/openrpc/full.json.gz index aa7e9b7aa..7d621f3ee 100644 Binary files a/build/openrpc/full.json.gz and b/build/openrpc/full.json.gz differ diff --git a/build/openrpc/gateway.json.gz b/build/openrpc/gateway.json.gz index f29115557..1988262e5 100644 Binary files a/build/openrpc/gateway.json.gz and b/build/openrpc/gateway.json.gz differ diff --git a/build/openrpc/miner.json.gz b/build/openrpc/miner.json.gz index 7bc14dca7..47bda504c 100644 Binary files a/build/openrpc/miner.json.gz and b/build/openrpc/miner.json.gz differ diff --git a/build/params_shared_vals.go b/build/params_shared_vals.go index fe5618f60..dd7386863 100644 --- a/build/params_shared_vals.go +++ b/build/params_shared_vals.go @@ -26,17 +26,13 @@ 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.Version20 -const TestNetworkVersion = network.Version18 - -///* inline-gen end */ +/* inline-gen end */ // Epochs const ForkLengthThreshold = Finality diff --git a/documentation/en/api-v0-methods-miner.md b/documentation/en/api-v0-methods-miner.md index 1a1499305..f14acfbd3 100644 --- a/documentation/en/api-v0-methods-miner.md +++ b/documentation/en/api-v0-methods-miner.md @@ -474,7 +474,7 @@ Inputs: ], "Bw==", 10101, - 18 + 20 ] ``` diff --git a/documentation/en/api-v0-methods.md b/documentation/en/api-v0-methods.md index e0b9d940c..95678782a 100644 --- a/documentation/en/api-v0-methods.md +++ b/documentation/en/api-v0-methods.md @@ -4727,7 +4727,7 @@ Perms: read Inputs: ```json [ - 18 + 20 ] ``` @@ -4742,7 +4742,7 @@ Perms: read Inputs: ```json [ - 18 + 20 ] ``` @@ -6368,7 +6368,7 @@ Inputs: ] ``` -Response: `18` +Response: `20` ### StateReadState StateReadState returns the indicated actor's state. diff --git a/documentation/en/api-v1-unstable-methods.md b/documentation/en/api-v1-unstable-methods.md index f7729b284..6a81465e2 100644 --- a/documentation/en/api-v1-unstable-methods.md +++ b/documentation/en/api-v1-unstable-methods.md @@ -6152,7 +6152,7 @@ Perms: read Inputs: ```json [ - 18 + 20 ] ``` @@ -6167,7 +6167,7 @@ Perms: read Inputs: ```json [ - 18 + 20 ] ``` @@ -7876,7 +7876,7 @@ Inputs: ] ``` -Response: `18` +Response: `20` ### StateReadState StateReadState returns the indicated actor's state. diff --git a/itests/kit/ensemble_opts_nv.go b/itests/kit/ensemble_opts_nv.go index aee1d9c2d..a30ed0e32 100644 --- a/itests/kit/ensemble_opts_nv.go +++ b/itests/kit/ensemble_opts_nv.go @@ -38,26 +38,25 @@ 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, + Network: network.Version19, Height: -1, }, stmgr.Upgrade{ - Network: network.Version18, + Network: network.Version20, Height: upgradeHeight, - Migration: filcns.UpgradeActorsV10, + Migration: filcns.UpgradeActorsV11, }) - ///* inline-gen end */ + /* inline-gen end */ } func TurboUpgradeAt(upgradeHeight abi.ChainEpoch) EnsembleOpt { diff --git a/itests/wdpost_test.go b/itests/wdpost_test.go index 43dc9a02a..08c9d4343 100644 --- a/itests/wdpost_test.go +++ b/itests/wdpost_test.go @@ -57,9 +57,6 @@ func TestWindowedPost(t *testing.T) { func testWindowPostUpgrade(t *testing.T, blocktime time.Duration, nSectors int, upgradeHeight abi.ChainEpoch) { - /// XXX TEMPORARILY DISABLED UNTIL NV18 MIGRATION IS IMPLEMENTED - t.Skip("temporarily disabled as nv18 migration is not yet implemented") - ctx, cancel := context.WithCancel(context.Background()) defer cancel()