feat: use Type from builtin-actors when building the bundle (#583)

This change upgrades to the v4 bundler that _does not_ depend on the FVM to map actor types to IDs. Instead, it relies on the Type enum defined in this repo.

This means new actor types can be added here without having to make changes in multiple places.

Author: Stebalien

Cargo.lock

@@ -26,11 +26,13 @@ fil_actor_system = { version = "9.0.0-alpha.1", path = "./actors/system", featur
 fil_actor_init = { version = "9.0.0-alpha.1", path = "./actors/init", features = ["fil-actor"] }
 
 [build-dependencies]
-fil_actor_bundler = "3.0.4"
+fil_actor_bundler = "4.0.0"
 cid = { version = "0.8.3", default-features = false, features = ["serde-codec"] }
+fil_actors_runtime = { version = "9.0.0-alpha.1", path = "runtime" }
+num-traits = "0.2.15"
 
 [dependencies]
-clap = { version = "3.1.8", features = ["derive"] }
+clap = { version = "3.2.3", features = ["derive"] }
 
 [features]
 default = [] ## translates to mainnet

Cargo.toml

@@ -1,4 +1,6 @@
 use fil_actor_bundler::Bundler;
+use fil_actors_runtime::runtime::builtins::Type;
+use num_traits::cast::FromPrimitive;
 use std::error::Error;
 use std::io::{BufRead, BufReader};
 use std::path::Path;
@@ -16,11 +18,11 @@ const ACTORS: &[(&Package, &ID)] = &[
     ("init", "init"),
     ("cron", "cron"),
     ("account", "account"),
-    ("multisig", "multisig"),
     ("power", "storagepower"),
     ("miner", "storageminer"),
     ("market", "storagemarket"),
     ("paych", "paymentchannel"),
+    ("multisig", "multisig"),
     ("reward", "reward"),
     ("verifreg", "verifiedregistry"),
 ];
@@ -158,7 +160,12 @@ fn main() -> Result<(), Box<dyn Error>> {
 
     let dst = Path::new(&out_dir).join("bundle.car");
     let mut bundler = Bundler::new(&dst);
-    for (pkg, id) in ACTORS {
+    for (&(pkg, name), id) in ACTORS.iter().zip(1u32..) {
+        assert_eq!(
+            name,
+            Type::from_u32(id).expect("type not defined").name(),
+            "actor types don't match actors included in the bundle"
+        );
         let bytecode_path = Path::new(&out_dir)
             .join("wasm32-unknown-unknown/wasm")
             .join(format!("fil_actor_{}.wasm", pkg));
@@ -167,10 +174,12 @@ fn main() -> Result<(), Box<dyn Error>> {
         // content-addressed CIDs.
         let forced_cid = None;
 
-        let cid = bundler.add_from_file(id, forced_cid, &bytecode_path).unwrap_or_else(|err| {
-            panic!("failed to add file {:?} to bundle for actor {}: {}", bytecode_path, id, err)
-        });
-        println!("cargo:warning=added actor {} to bundle with CID {}", id, cid);
+        let cid = bundler
+            .add_from_file(id, name.to_owned(), forced_cid, &bytecode_path)
+            .unwrap_or_else(|err| {
+                panic!("failed to add file {:?} to bundle for actor {}: {}", bytecode_path, id, err)
+            });
+        println!("cargo:warning=added {} ({}) to bundle with CID {}", name, id, cid);
     }
     bundler.finish().expect("failed to finish bundle");
 

build.rs

@@ -20,3 +20,21 @@ pub enum Type {
     Reward = 10,
     VerifiedRegistry = 11,
 }
+
+impl Type {
+    pub fn name(&self) -> &'static str {
+        match *self {
+            Type::System => "system",
+            Type::Init => "init",
+            Type::Cron => "cron",
+            Type::Account => "account",
+            Type::Power => "storagepower",
+            Type::Miner => "storageminer",
+            Type::Market => "storagemarket",
+            Type::PaymentChannel => "paymentchannel",
+            Type::Multisig => "multisig",
+            Type::Reward => "reward",
+            Type::VerifiedRegistry => "verifiedregistry",
+        }
+    }
+}