extract actors to filecoin-project/canonical-actors
#351
Conversation
This syscall allows an actor to determine if a given CodeCID belongs to a builtin actor.
Engine now has a preload_uncached method to preload the built-in actors bytecode.
| lazy_static! { | ||
| pub static ref DUMMY_ACCOUNT_ACTOR_CODE_ID: Cid = | ||
| Cid::new_v1(IPLD_RAW, Identity.digest(b"fil/test/dummyaccount")); | ||
| pub static ref DUMMY_INIT_ACTOR_CODE_ID: Cid = | ||
| Cid::new_v1(IPLD_RAW, Identity.digest(b"fil/test/dummyinit")); | ||
| } | ||
|
|
There was a problem hiding this comment.
These didn't need to be real CodeCIDs.
| #[repr(i32)] | ||
| pub enum Type { | ||
| System = 1, | ||
| Init = 2, | ||
| Cron = 3, | ||
| Account = 4, | ||
| Power = 5, | ||
| Miner = 6, | ||
| Market = 7, | ||
| PaymentChannel = 8, | ||
| Multisig = 9, | ||
| Reward = 10, | ||
| VerifiedRegistry = 11, | ||
| } |
There was a problem hiding this comment.
Explicitly enumerating these since they're part of the syscall ABI.
fvm/src/machine/default.rs
Outdated
| // Load the built-in actors manifest. | ||
| let builtin_actors: Manifest = blockstore | ||
| .get_cbor(&builtin_actors) | ||
| .context("failed to load built-in actor index")? | ||
| .ok_or_else(|| { | ||
| anyhow!( | ||
| "blockstore doesn't contain builtin actors index with CID {}", | ||
| &builtin_actors | ||
| ) | ||
| })?; | ||
|
|
||
| // Preload any uncached modules. | ||
| // This interface works for now because we know all actor CIDs | ||
| // ahead of time, but with user-supplied code, we won't have that | ||
| // guarantee. | ||
| engine.preload_uncached(&blockstore, builtin_actors.keys())?; | ||
|
|
||
| // Create a new state tree from the supplied root. | ||
| let state_tree = { | ||
| let bstore = BufferedBlockstore::new(blockstore); | ||
| StateTree::new_from_root(bstore, &context.initial_state_root)? | ||
| }; |
| for (k, bytecode) in actors { | ||
| self.load_bytecode(k, bytecode.expect("precompiled actor not found")) | ||
| .expect("failed to compile built-in actor"); | ||
| /// Instantiates and caches the Wasm modules for the bytecodes addressed by |
fvm/src/kernel/default.rs
Outdated
| let is_account = self | ||
| .call_manager | ||
| .machine() | ||
| .builtin_actors() | ||
| .get(&act.code) | ||
| .cloned() | ||
| .map(actor::builtin::is_account_actor) |
There was a problem hiding this comment.
It looks like we'll want a method on the machine to help with this (or maybe on the manifest?).
There was a problem hiding this comment.
Definitely not in the Machine as that would pollute the trait. Proper place would be in the Manifest, but right now it's a type alias and adding a method there would involve turning it into a newtype. Not sure about how the IPLD serde would interact with that, so given that our interest here is removing a 2-ocurrence duplication and that the net LoC gain of adding the newtype with deref, etc. would be higher, I'm inclined to just leave it as it is.
| let state_tree = StateTree::new_from_root(bstore, &context.initial_state_root)?; | ||
| // Load the built-in actors manifest. | ||
| let builtin_actors: Manifest = blockstore | ||
| .get_cbor(&builtin_actors) |
There was a problem hiding this comment.
NOTE: this isn't going to work the splitstore. We'll have to link to actors from the chain state.
There was a problem hiding this comment.
The idea we discussed was linking to these CIDs from the init actor state. But, we can't do this before the migration because that would alter the init actor state and break consensus. So the solution I gravitate towards is:
- Make the node (re-)import the CAR on the migration epoch.
- Then link the CodeCIDs in the init actor state.
In practical terms, we could do away with (2), because every actor will end up being linked from the state tree anyway:
- Singleton actors are permanent.
- Non-singleton actors cannot be destroyed, and there's many of each in the network already.
With this, Type => CID lookups become nicer.
This is the ref-fvm side of filecoin-project/builtin-actors#4. To be paired with the
raulk/initialbranch on https://github.com/filecoin-project/builtin-actors.{forest=>ipld}_bitfield.actor::is_builtin_actorsyscall.actor::get_code_cid_for_typesyscall.testing/conformanceimportbuiltin-actorsv6.fvm_shared::actor::builtinmodule with types to support the loading of builtin actor code and the resolution of CIDs.