Skip to content

Commit f84baa9

Browse files
alexytsualexytsu
authored
Update FVM types (#1330)
* bump versions inline with next helix set * temp bump to allow helix-onchain filecoin to build its integration tests * update to new fvm versions * unpatch helix libraries
1 parent b88cede commit f84baa9

File tree

29 files changed

+840
-630
lines changed

29 files changed

+840
-630
lines changed

‎Cargo.lock‎

Lines changed: 713 additions & 503 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fil_actor_verifreg = { version = "12.0.0", path = "./actors/verifreg", features
3232

3333
[build-dependencies]
3434
fil_actor_bundler = "5.0.0"
35-
cid = { version = "0.8.3", default-features = false, features = ["serde-codec"] }
35+
cid = { version = "0.10.1", default-features = false, features = ["serde-codec"] }
3636
fil_actors_runtime = { version = "12.0.0", path = "runtime" }
3737
num-traits = "0.2.15"
3838

@@ -66,9 +66,9 @@ members = [
6666
#fvm_ipld_bitfield = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" }
6767
#fvm_ipld_encoding = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" }
6868
#fvm_ipld_blockstore = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" }
69-
#fvm_actor_utils = { git = "https://github.com/helix-onchain/filecoin", branch = "main" }
70-
#frc42_dispatch = { git = "https://github.com/helix-onchain/filecoin", branch = "main" }
71-
#frc46_token = { git = "https://github.com/helix-onchain/filecoin", branch = "main" }
69+
#fvm_actor_utils = { git = "https://github.com/helix-onchain/filecoin", branch = "alex/update-fvm-ipld" }
70+
#frc42_dispatch = { git = "https://github.com/helix-onchain/filecoin", branch = "alex/update-fvm-ipld" }
71+
#frc46_token = { git = "https://github.com/helix-onchain/filecoin", branch = "alex/update-fvm-ipld" }
7272

7373
## Uncomment when working locally on ref-fvm and this repo simultaneously.
7474
## Assumes the ref-fvm checkout is in a sibling directory with the same name.

‎actors/account/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ crate-type = ["cdylib", "lib"]
1414

1515
[dependencies]
1616
fil_actors_runtime = { version = "12.0.0", path = "../../runtime" }
17-
frc42_dispatch = "3.2.0"
18-
fvm_actor_utils = "6.0.0"
19-
fvm_shared = { version = "3.2.0", default-features = false }
17+
frc42_dispatch = "3.3.0"
18+
fvm_actor_utils = "7.0.0"
19+
fvm_shared = { version = "3.4.0", default-features = false }
2020
serde = { version = "1.0.136", features = ["derive"] }
2121
num-traits = "0.2.14"
2222
num-derive = "0.3.3"
23-
fvm_ipld_blockstore = "0.1.1"
24-
fvm_ipld_encoding = "0.3.3"
23+
fvm_ipld_blockstore = "0.2.0"
24+
fvm_ipld_encoding = "0.4.0"
2525
anyhow = "1.0.65"
2626

2727
[dev-dependencies]

‎actors/cron/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ crate-type = ["cdylib", "lib"]
1515

1616
[dependencies]
1717
fil_actors_runtime = { version = "12.0.0", path = "../../runtime" }
18-
fvm_shared = { version = "3.2.0", default-features = false }
18+
fvm_shared = { version = "3.4.0", default-features = false }
1919
num-traits = "0.2.14"
2020
num-derive = "0.3.3"
2121
log = "0.4.14"
2222
serde = { version = "1.0.136", features = ["derive"] }
23-
fvm_ipld_blockstore = "0.1.1"
24-
fvm_ipld_encoding = "0.3.3"
23+
fvm_ipld_blockstore = "0.2.0"
24+
fvm_ipld_encoding = "0.4.0"
2525

2626
[dev-dependencies]
2727
fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }

‎actors/datacap/Cargo.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ crate-type = ["cdylib", "lib"]
1616
[dependencies]
1717
fil_actors_runtime = { version = "12.0.0", path = "../../runtime"}
1818

19-
cid = { version = "0.8.3", default-features = false, features = ["serde-codec"] }
20-
frc42_dispatch = "3.2.0"
21-
frc46_token = "6.0.0"
22-
fvm_actor_utils = "6.0.0"
23-
fvm_ipld_blockstore = "0.1.1"
24-
fvm_ipld_encoding = "0.3.3"
25-
fvm_ipld_hamt = "0.6.1"
26-
fvm_shared = { version = "3.2.0", default-features = false }
19+
cid = { version = "0.10.1", default-features = false, features = ["serde-codec"] }
20+
frc42_dispatch = "3.3.0"
21+
frc46_token = "7.0.0"
22+
fvm_actor_utils = "7.0.0"
23+
fvm_ipld_blockstore = "0.2.0"
24+
fvm_ipld_encoding = "0.4.0"
25+
fvm_ipld_hamt = "0.7.0"
26+
fvm_shared = { version = "3.4.0", default-features = false }
2727
lazy_static = "1.4.0"
2828
num-derive = "0.3.3"
2929
num-traits = "0.2.14"

‎actors/eam/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ serde_tuple = "0.5"
2020
rlp = { version = "0.5.1", default-features = false }
2121
anyhow = "1.0.65"
2222
log = "0.4.14"
23-
fvm_ipld_blockstore = "0.1.1"
24-
fvm_ipld_encoding = "0.3.3"
25-
multihash = { version = "0.16.1", default-features = false }
26-
cid = "0.8.6"
27-
fvm_shared = { version = "3.2.0", default-features = false }
23+
fvm_ipld_blockstore = "0.2.0"
24+
fvm_ipld_encoding = "0.4.0"
25+
multihash = { version = "0.18.1", default-features = false }
26+
cid = { version = "0.10.1", default-features = false, features = ["serde-codec"] }
27+
fvm_shared = { version = "3.4.0", default-features = false }
2828
num-traits = "0.2.15"
2929
num-derive = "0.3.3"
3030
hex-literal = "0.3.4"

‎actors/ethaccount/Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ crate-type = ["cdylib", "lib"]
1515

1616
[dependencies]
1717
fil_actors_runtime = { version = "12.0.0", path = "../../runtime" }
18-
frc42_dispatch = "3.2.0"
19-
fvm_actor_utils = "6.0.0"
18+
frc42_dispatch = "3.3.0"
19+
fvm_actor_utils = "7.0.0"
2020
serde = { version = "1.0.136", features = ["derive"] }
21-
fvm_ipld_encoding = "0.3.3"
22-
fvm_shared = { version = "3.2.0", default-features = false }
21+
fvm_ipld_encoding = "0.4.0"
22+
fvm_shared = { version = "3.4.0", default-features = false }
2323
num-traits = "0.2.15"
2424
num-derive = "0.3.3"
2525
hex-literal = "0.3.4"

‎actors/evm/Cargo.toml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@ crate-type = ["cdylib", "lib"]
1616

1717
[dependencies]
1818
fil_actors_runtime = { version = "12.0.0", path = "../../runtime" }
19-
fvm_shared = { version = "3.2.0", default-features = false }
20-
fvm_ipld_kamt = { version = "0.2.0" }
19+
fvm_shared = { version = "3.4.0", default-features = false }
20+
fvm_ipld_kamt = { version = "0.3.0" }
2121
serde = { version = "1.0.136", features = ["derive"] }
2222
serde_tuple = "0.5"
2323
num-traits = "0.2.14"
2424
num-derive = "0.3.3"
25-
cid = { version = "0.8.3", default-features = false, features = ["serde-codec"] }
25+
cid = { version = "0.10.1", default-features = false, features = ["serde-codec"] }
2626
anyhow = "1.0.65"
2727
log = "0.4.14"
28-
fvm_ipld_blockstore = "0.1.1"
29-
fvm_ipld_encoding = "0.3.3"
30-
multihash = { version = "0.16.1", default-features = false }
28+
fvm_ipld_blockstore = "0.2.0"
29+
fvm_ipld_encoding = "0.4.0"
30+
multihash = { version = "0.18.1", default-features = false }
3131
hex = { version = "0.4.3", features = ["serde"] }
3232
hex-literal = "0.3.4"
3333
substrate-bn = { version = "0.6.0", default-features = false }
34-
frc42_dispatch = "3.2.0"
34+
frc42_dispatch = "3.3.0"
3535
fil_actors_evm_shared = { version = "12.0.0", path = "shared" }
3636

3737
[dev-dependencies]

‎actors/evm/shared/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ keywords = ["filecoin", "web3", "wasm", "evm"]
1010

1111
[dependencies]
1212
serde = { version = "1.0.136", features = ["derive"] }
13-
fvm_shared = { version = "3.2.0", default-features = false }
13+
fvm_shared = { version = "3.4.0", default-features = false }
1414
fil_actors_runtime = { version = "12.0.0", path = "../../../runtime" }
15-
fvm_ipld_encoding = "0.3.3"
15+
fvm_ipld_encoding = "0.4.0"
1616
uint = { version = "0.9.3", default-features = false }
1717
hex = "0.4.3"

‎actors/evm/src/interpreter/system.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use std::borrow::Cow;
22

3+
use cid::multihash::Code;
34
use fil_actors_evm_shared::{address::EthAddress, uints::U256};
45
use fil_actors_runtime::{
56
actor_error, extract_send_result, runtime::EMPTY_ARR_CID, AsActorError, EAM_ACTOR_ID,
@@ -14,7 +15,6 @@ use fvm_shared::econ::TokenAmount;
1415
use fvm_shared::error::{ErrorNumber, ExitCode};
1516
use fvm_shared::sys::SendFlags;
1617
use fvm_shared::{MethodNum, Response, IPLD_RAW, METHOD_SEND};
17-
use multihash::Code;
1818

1919
use crate::state::{State, Tombstone};
2020
use crate::BytecodeHash;

0 commit comments

Comments
 (0)