Merge branch 'releases' into jen/masterbp

api/api_full.go

@@ -22,6 +22,7 @@ import (
 	"github.com/filecoin-project/go-state-types/builtin/v8/paych"
 	"github.com/filecoin-project/go-state-types/crypto"
 	"github.com/filecoin-project/go-state-types/dline"
+	abinetwork "github.com/filecoin-project/go-state-types/network"
 
 	apitypes "github.com/filecoin-project/lotus/api/types"
 	"github.com/filecoin-project/lotus/chain/actors/builtin"
@@ -590,6 +591,8 @@ type FullNode interface {
 	StateVMCirculatingSupplyInternal(context.Context, types.TipSetKey) (CirculatingSupply, error) //perm:read
 	// StateNetworkVersion returns the network version at the given tipset
 	StateNetworkVersion(context.Context, types.TipSetKey) (apitypes.NetworkVersion, error) //perm:read
+	// StateActorCodeCIDs returns the CIDs of all the builtin actors for the given network version
+	StateActorCodeCIDs(context.Context, abinetwork.Version) (map[string]cid.Cid, error) //perm:read
 
 	// StateGetRandomnessFromTickets is used to sample the chain for randomness.
 	StateGetRandomnessFromTickets(ctx context.Context, personalization crypto.DomainSeparationTag, randEpoch abi.ChainEpoch, entropy []byte, tsk types.TipSetKey) (abi.Randomness, error) //perm:read

api/docgen/docgen.go

@@ -195,6 +195,7 @@ func init() {
 	addExample(&si)
 	addExample(retrievalmarket.DealID(5))
 	addExample(abi.ActorID(1000))
+	addExample(map[string]cid.Cid{})
 	addExample(map[string][]api.SealedRef{
 		"98000": {
 			api.SealedRef{

api/v0api/full.go

@@ -18,6 +18,7 @@ import (
 	"github.com/filecoin-project/go-state-types/builtin/v8/paych"
 	"github.com/filecoin-project/go-state-types/crypto"
 	"github.com/filecoin-project/go-state-types/dline"
+	abinetwork "github.com/filecoin-project/go-state-types/network"
 
 	"github.com/filecoin-project/lotus/api"
 	apitypes "github.com/filecoin-project/lotus/api/types"
@@ -604,6 +605,8 @@ type FullNode interface {
 	StateVMCirculatingSupplyInternal(context.Context, types.TipSetKey) (api.CirculatingSupply, error) //perm:read
 	// StateNetworkVersion returns the network version at the given tipset
 	StateNetworkVersion(context.Context, types.TipSetKey) (apitypes.NetworkVersion, error) //perm:read
+	// StateActorCodeCIDs returns the CIDs of all the builtin actors for the given network version
+	StateActorCodeCIDs(context.Context, abinetwork.Version) (map[string]cid.Cid, error) //perm:read
 
 	// StateGetRandomnessFromTickets is used to sample the chain for randomness.
 	StateGetRandomnessFromTickets(ctx context.Context, personalization crypto.DomainSeparationTag, randEpoch abi.ChainEpoch, entropy []byte, tsk types.TipSetKey) (abi.Randomness, error) //perm:read

build/actors/README.md

@@ -16,3 +16,11 @@ This will:
 
 1. Download the actors bundles and pack them into the appropriate tarfile (`$VERSION.tar.zst`).
 2. Run `make bundle-gen` in the top-level directory to regenerate the bundle metadata file for _all_ network versions (all `*.tar.zst` files in this directory).
+
+## Overriding
+
+To build a bundle, but specify a different release/tag for a specific network, append `$network=$alternative_release` on the command line. For example:
+
+```bash
+./pack.sh v8 dev/20220602 mainnet=v8.0.0 calibrationnet=v8.0.0-rc.1
+```

build/actors/pack.sh

@@ -1,33 +1,49 @@
 #!/bin/bash
 
+NETWORKS=(devnet mainnet caterpillarnet butterflynet testing testing-fake-proofs calibrationnet)
+
 set -e
 
-if [[ $# -ne 2 ]]; then
-    echo "expected two arguments, an actors version (e.g., v8) and an actors release"
+if [[ $# -lt 2 ]]; then
+    echo "Usage: $0 VERSION RELEASE [NETWORK=RELEASE_OVERRIDE]..." >&2
+    echo "expected at least two arguments, an actors version (e.g., v8), an actors release, and any number of release overrides." >&2
     exit 1
 fi
 
 VERSION="$1" # actors version
 RELEASE="$2" # actors release name
-NETWORKS=(devnet mainnet caterpillarnet butterflynet testing testing-fake-proofs calibrationnet)
+RELEASE_OVERRIDES=("${@:3}")
 
-echo "Downloading bundles for actors version ${VERSION}, release ${RELEASE}"
+echo "Downloading bundles for actors version ${VERSION} release ${RELEASE}"
+echo "With release overrides ${RELEASE_OVERRIDES[*]}"
 
 TARGET_FILE="$(pwd)/${VERSION}.tar.zst"
 WORKDIR=$(mktemp -d -t "actor-bundles-${VERSION}.XXXXXXXXXX")
 trap 'rm -rf -- "$WORKDIR"' EXIT
 
+encode_release() {
+    jq -rn --arg release "$1" '$release | @uri'
+}
+
 pushd "${WORKDIR}"
-encoded_release="$(jq -rn --arg release "$RELEASE" '$release | @uri')"
 for network in "${NETWORKS[@]}"; do
+    release="$RELEASE"
+    # Ideally, we'd use an associative array (map). But that's not supported on macos.
+    for override in "${RELEASE_OVERRIDES[@]}"; do
+        if [[ "${network}" = "${override%%=*}" ]]; then
+            release="${override#*=}"
+            break
+        fi
+    done
+    encoded_release="$(encode_release "$release")"
+    echo "Downloading $release for network $network."
     wget "https://github.com/filecoin-project/builtin-actors/releases/download/${encoded_release}/builtin-actors-${network}"{.car,.sha256}
 done
 
 echo "Checking the checksums..."
 
 sha256sum -c -- *.sha256
 
-
 echo "Packing..."
 
 rm -f -- "$TARGET_FILE"