Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wire in the customized EAM actor into genesis #676

Merged
merged 31 commits into from
Feb 16, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
44edd68
adding ipc eam actor
Feb 1, 2024
8699df1
fmt code
Feb 1, 2024
71d162a
fmt code
Feb 1, 2024
ae025e2
integrate with fendermint
Feb 2, 2024
61c33a1
initial commit
Feb 8, 2024
53155d4
Merge branch 'main' of protocol-github:consensus-shipyard/ipc into mo…
Feb 8, 2024
6a90127
unit tests passing
Feb 8, 2024
8ee6196
Merge branch 'main' of protocol-github:consensus-shipyard/ipc into en…
Feb 8, 2024
6d1f95b
Merge branch 'eng-608' of protocol-github:consensus-shipyard/ipc into…
Feb 8, 2024
b1d5fd6
fix code review
Feb 8, 2024
951a29a
remove deployment of IPC EAM
Feb 8, 2024
bdfb841
remove contract deployer
Feb 8, 2024
2c6076b
add comment
Feb 8, 2024
a4e226f
fix main linter
Feb 8, 2024
b45a1b3
fmt
Feb 8, 2024
80135dd
Merge branch 'main' into eng-608
cryptoAtwill Feb 9, 2024
d58c1f6
merge with base
Feb 9, 2024
04962ec
remove unused crate
Feb 9, 2024
59554c4
Merge branch 'main' into eng-608
cryptoAtwill Feb 9, 2024
c5ef5d5
Merge branch 'eng-608' of protocol-github:consensus-shipyard/ipc into…
Feb 9, 2024
97231a8
support IPC EAM
Feb 9, 2024
9dfa80e
merge with main and update implementation
Feb 15, 2024
761ac73
remove unused code
Feb 15, 2024
90dfca6
update comment to todo
Feb 15, 2024
f9b040c
add genesis permission mode
Feb 15, 2024
e646d3f
format code
Feb 15, 2024
dc197fb
revert fmt binding
Feb 15, 2024
4357c40
Add genesis command to update EAM permission mode (#709)
cryptoAtwill Feb 16, 2024
a954cb5
Merge branch 'main' into modify-builtin-actor
cryptoAtwill Feb 16, 2024
6966d83
Merge branch 'main' into modify-builtin-actor
cryptoAtwill Feb 16, 2024
58a073d
Revert lib.rs
cryptoAtwill Feb 16, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ futures-core = "0.3"
futures-util = "0.3"
gcra = "0.4"
hex = "0.4"
hex-literal = "0.4.1"
im = "15.1.0"
integer-encoding = { version = "3.0.3", default-features = false }
jsonrpc-v2 = { version = "0.11", default-features = false, features = [
Expand Down Expand Up @@ -117,6 +118,7 @@ quickcheck_macros = "1"
rand = "0.8"
rand_chacha = "0.3"
regex = "1"
rlp = { version = "0.5.1", default-features = false }
reqwest = { version = "0.11.13", features = ["json"] }
sha2 = "0.10"
serde = { version = "1", features = ["derive"] }
Expand Down Expand Up @@ -183,6 +185,7 @@ fvm_ipld_amt = "0.6.2"
# and this copy-paste is clunky, so at least for those that have it, we should use it.
# Keep the version here in sync with the Makefile!
fil_actors_evm_shared = { git = "https://github.com/filecoin-project/builtin-actors", tag = "v12.0.0" }
fil_actor_eam = { git = "https://github.com/filecoin-project/builtin-actors", tag = "v12.0.0" }
fil_actors_runtime = { git = "https://github.com/filecoin-project/builtin-actors", tag = "v12.0.0" }

cid = { version = "0.10.1", default-features = false, features = [
Expand Down
2 changes: 2 additions & 0 deletions fendermint/actors/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ license.workspace = true
fendermint_actor_chainmetadata = { path = "chainmetadata", features = [
"fil-actor",
] }
fendermint_actor_eam = { path = "eam", features = ["fil-actor"] }

[dependencies]
cid = { workspace = true }
anyhow = { workspace = true }
fvm_ipld_blockstore = { workspace = true }
fvm_ipld_encoding = { workspace = true }
fendermint_actor_chainmetadata = { path = "chainmetadata" }
fendermint_actor_eam = { path = "eam" }

[build-dependencies]
fil_actors_runtime = { workspace = true, features = ["test_utils"] }
Expand Down
2 changes: 1 addition & 1 deletion fendermint/actors/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use std::path::Path;
use std::process::{Command, Stdio};
use std::thread;

const ACTORS: &[&str] = &["chainmetadata"];
const ACTORS: &[&str] = &["chainmetadata", "eam"];

const FILES_TO_WATCH: &[&str] = &["Cargo.toml", "src"];

Expand Down
35 changes: 35 additions & 0 deletions fendermint/actors/eam/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[package]
name = "fendermint_actor_eam"
description = "Builtin Ethereum address manager actor for IPC"
license.workspace = true
edition.workspace = true
authors.workspace = true
version = "0.1.0"

[lib]
## lib is necessary for integration tests
## cdylib is necessary for Wasm build
crate-type = ["cdylib", "lib"]

[dependencies]
anyhow = { workspace = true }
cid = { workspace = true }
fil_actor_eam = { workspace = true }
fil_actors_runtime = { workspace = true }
fvm_ipld_blockstore = { workspace = true }
fvm_ipld_encoding = { workspace = true }
fvm_shared = { workspace = true }
log = { workspace = true }
multihash = { workspace = true }
num-derive = { workspace = true }
num-traits = { workspace = true }
serde = { workspace = true }
hex-literal = { workspace = true }
rlp = { workspace = true }

[dev-dependencies]
fil_actors_evm_shared = { workspace = true }
fil_actors_runtime = { workspace = true, features = ["test_utils"] }

[features]
fil-actor = ["fil_actors_runtime/fil-actor"]
Loading
Loading