FIP0031 refinements

.circleci/config.yml

@@ -48,6 +48,7 @@ commands:
             - run: sudo apt-get install ocl-icd-opencl-dev libhwloc-dev
       - run: git submodule sync
       - run: git submodule update --init
+      - fetch_builtin_actors
   download-params:
     steps:
       - restore_cache:
@@ -83,6 +84,23 @@ commands:
           name: fetch all tags
           command: |
             git fetch --all
+  fetch_builtin_actors:
+    steps:
+      - restore_cache:
+          name: restore builtin actors bundle cache
+          keys:
+            - 'builtin-actors-v8.car'
+          paths:
+            - build/builtin-actors/
+      - run:
+          name: fetch builtin actor bundles
+          command: |
+            build/builtin-actors/fetch-bundles.sh
+      - save_cache:
+          name: save builtin actors bundle cache
+          key: 'builtin-actors-v8.car'
+          paths:
+            - build/builtin-actors/
 
   packer_build:
     description: "Run a packer build"
@@ -224,7 +242,7 @@ jobs:
 
   test-conformance:
     description: |
-      Run tests using a corpus of interoperable test vectors for Filecoin 
+      Run tests using a corpus of interoperable test vectors for Filecoin
       implementations to test their correctness and compliance with the Filecoin
       specifications.
     parameters:

.circleci/template.yml

@@ -48,6 +48,7 @@ commands:
             - run: sudo apt-get install ocl-icd-opencl-dev libhwloc-dev
       - run: git submodule sync
       - run: git submodule update --init
+      - fetch_builtin_actors
   download-params:
     steps:
       - restore_cache:
@@ -83,6 +84,23 @@ commands:
           name: fetch all tags
           command: |
             git fetch --all
+  fetch_builtin_actors:
+    steps:
+      - restore_cache:
+          name: restore builtin actors bundle cache
+          keys:
+            - 'builtin-actors-v8.car'
+          paths:
+            - build/builtin-actors/
+      - run:
+          name: fetch builtin actor bundles
+          command: |
+            build/builtin-actors/fetch-bundles.sh
+      - save_cache:
+          name: save builtin actors bundle cache
+          key: 'builtin-actors-v8.car'
+          paths:
+            - build/builtin-actors/
 
   packer_build:
     description: "Run a packer build"
@@ -224,7 +242,7 @@ jobs:
 
   test-conformance:
     description: |
-      Run tests using a corpus of interoperable test vectors for Filecoin 
+      Run tests using a corpus of interoperable test vectors for Filecoin
       implementations to test their correctness and compliance with the Filecoin
       specifications.
     parameters:

.gitignore

@@ -48,3 +48,5 @@ bin/ipget
 bin/tmp/*
 .idea
 scratchpad
+
+build/builtin-actors/*.car

Makefile

@@ -57,6 +57,14 @@ build/.update-modules:
 
 # end git modules
 
+# builtin actor bundles
+builtin-actor-bundles:
+	./build/builtin-actors/fetch-bundles.sh
+
+BUILD_DEPS+=builtin-actor-bundles
+
+.PHONY: builtin-actor-bundles
+
 ## MAIN BINARIES
 
 CLEAN+=build/.update-modules
@@ -362,4 +370,4 @@ print-%:
 	@echo $*=$($*)
 
 circleci:
-	go generate -x ./.circleci
+	go generate -x ./.circleci

api/api_storage.go

@@ -16,7 +16,7 @@ import (
 	datatransfer "github.com/filecoin-project/go-data-transfer"
 	"github.com/filecoin-project/go-state-types/abi"
 	abinetwork "github.com/filecoin-project/go-state-types/network"
-	"github.com/filecoin-project/specs-actors/v2/actors/builtin/market"
+	"github.com/filecoin-project/specs-actors/v8/actors/builtin/market"
 	"github.com/filecoin-project/specs-storage/storage"
 
 	"github.com/filecoin-project/go-fil-markets/piecestore"

build/builtin-actors/README.md

@@ -0,0 +1,3 @@
+This directory contains the builtin actors v8 bundle, to be emdedded in the binary.
+To change your actor bundle, prior to fixing for nv16 upgrade, generate a bundle using the actor
+bundler and place it in this directory, in a file named builtin-actors-v8.car

build/builtin-actors/fetch-bundles.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+set -e
+
+cd "$(dirname "$0")"
+
+# gateway to use
+dweb="dweb.link"
+
+actors7_cid=""
+actors7_hash=""
+actors8_cid="bafybeictmywrut5tprz5fnoti6adfwuvixvrfardhqwldxosmdsfavc56e"
+actors8_hash="687b38f59b0c32800f55a8f1f303de214ec173c90e653984d67f393bc41c1416"
+
+die() {
+    echo "$1"
+    exit 1
+}
+
+check() {
+    file=$1
+    hash=$2
+    if [ -e "$file" ]; then
+        echo "$hash  $file" | shasum -a 256 --check
+    else
+        return 1
+    fi
+}
+
+fetch() {
+    output=$1
+    cid=$2
+    hash=$3
+    if (check "$output" "$hash"); then
+        return 0
+    else
+        echo "fetching $cid to $output"
+        curl --retry 3 -k "https://$dweb/ipfs/$cid" -o "$output"
+        check "$output" "$hash" || die "hash mismatch"
+    fi
+}
+
+if [ -n "$actors7_cid" ]; then
+    fetch builtin-actors-v7.car "$actors7_cid" "$actors7_hash"
+else
+    touch builtin-actors-v7.car
+fi
+
+if [ -n "$actors8_cid" ]; then
+    fetch builtin-actors-v8.car "$actors8_cid" "$actors8_hash"
+else
+    touch builtin-actors-v8.car
+fi

build/builtin_actors.go

@@ -0,0 +1,19 @@
+package build
+
+import (
+	_ "embed"
+)
+
+//go:embed builtin-actors/builtin-actors-v8.car
+var actorsv8 []byte
+
+func BuiltinActorsV8Bundle() []byte {
+	return actorsv8
+}
+
+//go:embed builtin-actors/builtin-actors-v7.car
+var actorsv7 []byte
+
+func BuiltinActorsV7Bundle() []byte {
+	return actorsv7
+}

build/params_2k.go

@@ -48,6 +48,7 @@ var UpgradeHyperdriveHeight = abi.ChainEpoch(-16)
 var UpgradeChocolateHeight = abi.ChainEpoch(-17)
 
 var UpgradeOhSnapHeight = abi.ChainEpoch(-18)
+var UpgradeFVM1Height = abi.ChainEpoch(-19)
 
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,
@@ -91,6 +92,7 @@ func init() {
 	UpgradeHyperdriveHeight = getUpgradeHeight("LOTUS_HYPERDRIVE_HEIGHT", UpgradeHyperdriveHeight)
 	UpgradeChocolateHeight = getUpgradeHeight("LOTUS_CHOCOLATE_HEIGHT", UpgradeChocolateHeight)
 	UpgradeOhSnapHeight = getUpgradeHeight("LOTUS_OHSNAP_HEIGHT", UpgradeOhSnapHeight)
+	UpgradeFVM1Height = getUpgradeHeight("LOTUS_FVM1_HEIGHT", UpgradeFVM1Height)
 
 	BuildType |= Build2k
 

build/params_butterfly.go

@@ -44,6 +44,8 @@ const UpgradeChocolateHeight = -17
 
 const UpgradeOhSnapHeight = 240
 
+var UpgradeFVM1Height = abi.ChainEpoch(99999999999999)
+
 func init() {
 	policy.SetConsensusMinerMinPower(abi.NewStoragePower(2 << 30))
 	policy.SetSupportedProofTypes(

build/params_calibnet.go

@@ -57,6 +57,8 @@ const UpgradeChocolateHeight = 312746
 // 2022-02-10T19:23:00Z
 const UpgradeOhSnapHeight = 682006
 
+var UpgradeFVM1Height = abi.ChainEpoch(99999999999999)
+
 func init() {
 	policy.SetConsensusMinerMinPower(abi.NewStoragePower(32 << 30))
 	policy.SetSupportedProofTypes(

build/params_interop.go

@@ -48,6 +48,7 @@ var UpgradeTurboHeight = abi.ChainEpoch(-15)
 var UpgradeHyperdriveHeight = abi.ChainEpoch(-16)
 var UpgradeChocolateHeight = abi.ChainEpoch(-17)
 var UpgradeOhSnapHeight = abi.ChainEpoch(-18)
+var UpgradeFVM1Height = abi.ChainEpoch(-19)
 
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,
@@ -93,6 +94,9 @@ func init() {
 	UpgradeNorwegianHeight = getUpgradeHeight("LOTUS_NORWEGIAN_HEIGHT", UpgradeNorwegianHeight)
 	UpgradeTurboHeight = getUpgradeHeight("LOTUS_ACTORSV4_HEIGHT", UpgradeTurboHeight)
 	UpgradeHyperdriveHeight = getUpgradeHeight("LOTUS_HYPERDRIVE_HEIGHT", UpgradeHyperdriveHeight)
+	UpgradeChocolateHeight = getUpgradeHeight("LOTUS_CHOCOLATE_HEIGHT", UpgradeChocolateHeight)
+	UpgradeOhSnapHeight = getUpgradeHeight("LOTUS_OHSNAP_HEIGHT", UpgradeOhSnapHeight)
+	UpgradeFVM1Height = getUpgradeHeight("LOTUS_FVM1_HEIGHT", UpgradeFVM1Height)
 
 	BuildType |= BuildInteropnet
 	SetAddressNetwork(address.Testnet)

build/params_mainnet.go

@@ -70,6 +70,8 @@ const UpgradeChocolateHeight = 1231620
 // 2022-03-01T15:00:00Z
 var UpgradeOhSnapHeight = abi.ChainEpoch(1594680)
 
+var UpgradeFVM1Height = abi.ChainEpoch(99999999999999)
+
 func init() {
 	if os.Getenv("LOTUS_USE_TEST_ADDRESSES") != "1" {
 		SetAddressNetwork(address.Mainnet)

build/params_shared_vals.go

@@ -34,7 +34,7 @@ const NewestNetworkVersion = network.Version{{.latestNetworkVersion}}
 
 /* inline-gen start */
 
-const NewestNetworkVersion = network.Version15
+const NewestNetworkVersion = network.Version16
 
 /* inline-gen end */
 

build/params_testground.go

@@ -100,6 +100,7 @@ var (
 	UpgradeHyperdriveHeight abi.ChainEpoch = -15
 	UpgradeChocolateHeight  abi.ChainEpoch = -16
 	UpgradeOhSnapHeight     abi.ChainEpoch = -17
+	UpgradeFVM1Height       abi.ChainEpoch = -18
 
 	DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 		0: DrandMainnet,

chain/actors/agen/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"bytes"
 	"fmt"
+	"go/format"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -77,7 +78,12 @@ func generateAdapters() error {
 				return err
 			}
 
-			if err := ioutil.WriteFile(filepath.Join(actDir, fmt.Sprintf("%s.go", act)), b.Bytes(), 0666); err != nil {
+			fmted, err := format.Source(b.Bytes())
+			if err != nil {
+				return err
+			}
+
+			if err := ioutil.WriteFile(filepath.Join(actDir, fmt.Sprintf("%s.go", act)), fmted, 0666); err != nil {
 				return err
 			}
 		}