Merge pull request #8642 from filecoin-project/feat/nv16-bundles

[nv16] dynamic loading of builtin actor bundles

Author: vyzo

.circleci/config.yml

@@ -48,7 +48,6 @@ 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:
@@ -84,12 +83,6 @@ commands:
           name: fetch all tags
           command: |
             git fetch --all
-  fetch_builtin_actors:
-    steps:
-      - run:
-          name: fetch builtin actor bundles
-          command: |
-            build/builtin-actors/fetch-bundles.sh
   packer_build:
     description: "Run a packer build"
     parameters:

.circleci/template.yml

@@ -48,7 +48,6 @@ 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:
@@ -84,12 +83,6 @@ commands:
           name: fetch all tags
           command: |
             git fetch --all
-  fetch_builtin_actors:
-    steps:
-      - run:
-          name: fetch builtin actor bundles
-          command: |
-            build/builtin-actors/fetch-bundles.sh
   packer_build:
     description: "Run a packer build"
     parameters:

Makefile

@@ -57,14 +57,6 @@ 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
@@ -79,15 +71,19 @@ debug: GOFLAGS+=-tags=debug
 debug: build-devnets
 
 2k: GOFLAGS+=-tags=2k
+2k: GOFLAGS+=-ldflags=-X=github.com/filecoin-project/lotus/build.NetworkBundle=devnet
 2k: build-devnets
 
 calibnet: GOFLAGS+=-tags=calibnet
+calibnet: GOFLAGS+=-ldflags=-X=github.com/filecoin-project/lotus/build.NetworkBundle=calibrationnet
 calibnet: build-devnets
 
 butterflynet: GOFLAGS+=-tags=butterflynet
+butterflynet: GOFLAGS+=-ldflags=-X=github.com/filecoin-project/lotus/build.NetworkBundle=butterflynet
 butterflynet: build-devnets
 
 interopnet: GOFLAGS+=-tags=interopnet
+interopnet: GOFLAGS+=-ldflags=-X=github.com/filecoin-project/lotus/build.NetworkBundle=caterpillarnet
 interopnet: build-devnets
 
 lotus: $(BUILD_DEPS)

build/builtin-actors/README.md

@@ -0,0 +1,27 @@
+package build
+
+import (
+	"bytes"
+
+	"github.com/filecoin-project/lotus/chain/actors"
+
+	"github.com/BurntSushi/toml"
+)
+
+var BuiltinActorReleases map[actors.Version]string
+
+func init() {
+	BuiltinActorReleases = make(map[actors.Version]string)
+
+	spec := BundleSpec{}
+
+	r := bytes.NewReader(BuiltinActorBundles)
+	_, err := toml.DecodeReader(r, &spec)
+	if err != nil {
+		panic(err)
+	}
+
+	for _, b := range spec.Bundles {
+		BuiltinActorReleases[b.Version] = b.Release
+	}
+}