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

chore: release 16.0.0-dev #1591

Merged
merged 1 commit into from
Dec 3, 2024
Merged

chore: release 16.0.0-dev #1591

merged 1 commit into from
Dec 3, 2024

Conversation

rvagg
Copy link
Member

@rvagg rvagg commented Dec 3, 2024

No description provided.

@rvagg rvagg requested a review from rjan90 December 3, 2024 03:52
Copy link

github-actions bot commented Dec 3, 2024

Suggested version: 16.0.0-dev

Comparing to: v15.0.0 (diff)

Changes in configuration file(s):

diff --git a/Cargo.toml b/Cargo.toml
index 925a7d24..9feaa75e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -116,30 +116,30 @@ rlp = { version = "0.5.1", default-features = false }
 substrate-bn = { version = "0.6.0", default-features = false }
 
 # IPLD/Encoding
-cid = { version = "0.10.1", default-features = false, features = [
-     "serde-codec",
+cid = { version = "0.11.1", default-features = false, features = [
+     "serde",
      "std",
 ] }
-multihash = { version = "0.18.1", default-features = false, features = [
-     "multihash-impl",
-] }
-libipld-core = { version = "0.13.1", features = ["serde-codec"] }
+multihash = { version = "0.19.1", default-features = false }
+multihash-codetable = { version = "0.1.4", default-features = false }
+multihash-derive = { version = "0.9.1", default-features = false }
+ipld-core = { version = "0.4.1", features = ["serde"] }
 integer-encoding = { version = "3.0.3", default-features = false }
 
-# helix-onchain
-fvm_actor_utils = "11.0.0"
-frc42_dispatch = "7.0.0"
-frc46_token = "11.0.0"
+# actor-utils
+fvm_actor_utils = "12.0.0"
+frc42_dispatch = "8.0.0"
+frc46_token = "12.0.0"
 
 # FVM
-fvm_sdk = "4.3.0"
-fvm_shared = "4.3.0"
-fvm_ipld_encoding = "0.4.0"
-fvm_ipld_blockstore = "0.2.0"
-fvm_ipld_hamt = "0.9.0"
-fvm_ipld_kamt = "0.3.0"
-fvm_ipld_amt = { version = "0.6.2" }
-fvm_ipld_bitfield = "0.6.0"
+fvm_sdk = "4.5.1"
+fvm_shared = "4.5.1"
+fvm_ipld_encoding = "0.5.0"
+fvm_ipld_blockstore = "0.3.0"
+fvm_ipld_hamt = "0.10.2"
+fvm_ipld_kamt = "0.4.2"
+fvm_ipld_amt = { version = "0.7.3" }
+fvm_ipld_bitfield = "0.7.0"
 
 # workspace
 fil_actor_account = { path = "actors/account" }
@@ -165,7 +165,7 @@ fil_actors_integration_tests = { version = "1.0.0", path = "integration_tests" }
 vm_api = { version = "1.0.0", path = "vm_api" }
 test_vm = { path = "test_vm" }
 
-[patch.crates-io]
+#[patch.crates-io]
 #fvm_shared = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" }
 #fvm_sdk = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" }
 #fvm_ipld_hamt = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" }
@@ -173,9 +173,9 @@ test_vm = { path = "test_vm" }
 #fvm_ipld_bitfield = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" }
 #fvm_ipld_encoding = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" }
 #fvm_ipld_blockstore = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" }
-#fvm_actor_utils = { git = "https://github.com/helix-onchain/filecoin", branch = "main" }
-#frc42_dispatch = { git = "https://github.com/helix-onchain/filecoin", branch = "main" }
-#frc46_token = { git = "https://github.com/helix-onchain/filecoin", branch = "main" }
+#fvm_actor_utils = { git = "https://github.com/filecoin-project/actors-utils", branch = "main" }
+#frc42_dispatch = { git = "https://github.com/filecoin-project/actors-utils", branch = "main" }
+#frc46_token = { git = "https://github.com/filecoin-project/actors-utils", branch = "main" }
 
 ## Uncomment when working locally on ref-fvm and this repo simultaneously.
 ## Assumes the ref-fvm checkout is in a sibling directory with the same name.
@@ -192,17 +192,19 @@ test_vm = { path = "test_vm" }
 ## Uncomment entries below when working locally on ref-fvm and this repo simultaneously.
 ## Assumes the ref-fvm checkout is in a sibling directory with the same name.
 ## (Valid once FVM modules are published to crates.io)
-# [patch.crates-io]
-# fvm_shared = { path = "../ref-fvm/shared" }
-# fvm_sdk = { path = "../ref-fvm/sdk" }
-# fvm_ipld_hamt = { path = "../ref-fvm/ipld/hamt" }
-# fvm_ipld_amt = { path = "../ref-fvm/ipld/amt" }
-# fvm_ipld_bitfield = { path = "../ref-fvm/ipld/bitfield"}
-# fvm_ipld_encoding = { path = "../ref-fvm/ipld/encoding"}
-# fvm_ipld_blockstore = { path = "../ref-fvm/ipld/blockstore"}
-#fvm_actor_utils = { path = "../../filecoin/fvm_actor_utils"}
-#frc42_dispatch = { path = "../../filecoin/frc42_dispatch"}
-#frc46_token = { path = "../../filecoin/frc46_token"}
+#[patch.crates-io]
+#fvm_shared = { path = "../ref-fvm/shared" }
+#fvm_sdk = { path = "../ref-fvm/sdk" }
+#fvm_ipld_car = { path = "../ref-fvm/ipld/car" }
+#fvm_ipld_hamt = { path = "../ref-fvm/ipld/hamt" }
+#fvm_ipld_amt = { path = "../ref-fvm/ipld/amt" }
+#fvm_ipld_bitfield = { path = "../ref-fvm/ipld/bitfield"}
+#fvm_ipld_encoding = { path = "../ref-fvm/ipld/encoding"}
+#fvm_ipld_blockstore = { path = "../ref-fvm/ipld/blockstore"}
+#fvm_actor_utils = { path = "../actors-utils/fvm_actor_utils"}
+#fil_actor_bundler = { path = "../builtin-actors-bundler"}
+#frc42_dispatch = { path = "../actors-utils/frc42_dispatch"}
+#frc46_token = { path = "../actors-utils/frc46_token"}
 
 [profile.wasm]
 inherits = "release"diff --git a/actors/evm/Cargo.toml b/actors/evm/Cargo.toml
index 7515908d..8149e9ed 100644
--- a/actors/evm/Cargo.toml
+++ b/actors/evm/Cargo.toml
@@ -26,7 +26,7 @@ anyhow = { workspace = true }
 log = { workspace = true }
 fvm_ipld_blockstore = { workspace = true }
 fvm_ipld_encoding = { workspace = true }
-multihash = { workspace = true }
+multihash-codetable = { workspace = true }
 frc42_dispatch = { workspace = true }
 fil_actors_evm_shared = { workspace = true }
 hex = { workspace = true }
diff --git a/actors/market/Cargo.toml b/actors/market/Cargo.toml
index 9de92154..5b01da15 100644
--- a/actors/market/Cargo.toml
+++ b/actors/market/Cargo.toml
@@ -26,12 +26,13 @@ fvm_ipld_encoding = { workspace = true }
 fvm_ipld_hamt = { workspace = true }
 fvm_shared = { workspace = true }
 integer-encoding = { workspace = true }
-libipld-core = { workspace = true }
+ipld-core = { workspace = true }
 log = { workspace = true }
 num-derive = { workspace = true }
 num-traits = { workspace = true }
 serde = { workspace = true }
 lazy_static = { workspace = true }
+multihash-codetable = { workspace = true }
 
 [dev-dependencies]
 fil_actors_runtime = { workspace = true, features = ["test_utils", "sector-default"] }
@@ -39,7 +40,6 @@ fil_actor_power = { workspace = true }
 fil_actor_reward = { workspace = true }
 fil_actor_verifreg = { workspace = true }
 fvm_ipld_amt = { workspace = true }
-multihash = { workspace = true }
 regex = { workspace = true }
 itertools = { workspace = true }
 
diff --git a/actors/miner/Cargo.toml b/actors/miner/Cargo.toml
index bc03e1ae..e78023c2 100644
--- a/actors/miner/Cargo.toml
+++ b/actors/miner/Cargo.toml
@@ -33,6 +33,7 @@ lazy_static = { workspace = true }
 log = { workspace = true }
 byteorder = { workspace = true }
 itertools = { workspace = true }
+multihash-codetable = { workspace = true }
 
 [dev-dependencies]
 fil_actors_runtime = { workspace = true, features = ["test_utils", "sector-default"] }
@@ -43,6 +44,7 @@ fil_actor_market = { workspace = true }
 rand = { workspace = true }
 test-case = { workspace = true }
 const-hex = { workspace = true }
+multihash-derive = { workspace = true }
 
 [features]
 fil-actor = ["fil_actors_runtime/fil-actor"]
diff --git a/actors/system/Cargo.toml b/actors/system/Cargo.toml
index 8a7b11b0..6d14065f 100644
--- a/actors/system/Cargo.toml
+++ b/actors/system/Cargo.toml
@@ -17,6 +17,7 @@ crate-type = ["cdylib", "lib"]
 fil_actors_runtime = { workspace = true }
 fvm_shared = { workspace = true }
 fvm_ipld_encoding = { workspace = true }
+multihash-codetable = { workspace = true }
 fvm_ipld_blockstore = { workspace = true }
 num-traits = { workspace = true }
 anyhow = { workspace = true }
diff --git a/integration_tests/Cargo.toml b/integration_tests/Cargo.toml
index 166f3c60..e04f4d1c 100644
--- a/integration_tests/Cargo.toml
+++ b/integration_tests/Cargo.toml
@@ -60,8 +60,8 @@ thiserror = { workspace = true }
 libsecp256k1 = { workspace = true }
 export_macro = { path = "./macro" }
 ctor = "0.2.5"
+multihash-codetable = { workspace = true }
 
 [dev-dependencies]
-multihash = { workspace = true }
 test-case = { workspace = true }
 hex-literal = { workspace = true }
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index 3379ac93..265aa940 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -23,7 +23,7 @@ integer-encoding = { workspace = true }
 itertools = { workspace = true }
 lazy_static = { workspace = true }
 log = { workspace = true }
-multihash = { workspace = true }
+multihash-codetable = { workspace = true }
 num = { workspace = true  }
 num-derive = { workspace = true }
 num-traits = { workspace = true }
@@ -44,7 +44,7 @@ blake2b_simd = { workspace = true, optional = true }
 hex = { workspace = true, optional = true }
 pretty_env_logger = { workspace = true, optional = true }
 rand = { workspace = true, optional = true }
-base64 = "0.21.2"
+multihash-derive = { workspace = true, optional = true }
 
 [dependencies.libsecp256k1]
 workspace = true
@@ -52,6 +52,7 @@ features = ["static-context", "std"]
 optional = true
 
 [dev-dependencies]
+base64 = "0.21.2"
 derive_builder = { workspace = true }
 hex = { workspace = true }
 rand = { workspace = true }
@@ -93,4 +94,4 @@ no-provider-deal-collateral = []
 fake-proofs = []
 
 
-test_utils = ["hex", "multihash/sha2", "multihash/sha3", "multihash/ripemd", "libsecp256k1", "blake2b_simd", "rand", "rand/std_rng", "pretty_env_logger"]
+test_utils = ["hex", "multihash-derive", "multihash-codetable/sha2", "multihash-codetable/sha3", "multihash-codetable/ripemd", "libsecp256k1", "blake2b_simd", "rand", "rand/std_rng", "pretty_env_logger"]
diff --git a/test_vm/Cargo.toml b/test_vm/Cargo.toml
index 25811280..f8eeb006 100644
--- a/test_vm/Cargo.toml
+++ b/test_vm/Cargo.toml
@@ -41,8 +41,8 @@ integer-encoding = { workspace = true }
 num-traits = { workspace = true }
 serde = { workspace = true }
 vm_api = { workspace = true }
+multihash-codetable = { workspace = true }
 
 [dev-dependencies]
-multihash = { workspace = true }
 test-case = { workspace = true }
 fil_actors_integration_tests = { workspace = true }
diff --git a/vm_api/Cargo.toml b/vm_api/Cargo.toml
index ccd36b11..29cadc0b 100644
--- a/vm_api/Cargo.toml
+++ b/vm_api/Cargo.toml
@@ -23,6 +23,8 @@ rand = { workspace = true }
 rand_chacha = { workspace = true }
 serde = { workspace = true }
 
-[features]
-testing = []
+multihash-codetable = { workspace = true }
+multihash-derive = { workspace = true, optional = true }
 
+[features]
+testing = ["multihash-derive"]

Cutting a Release (and modifying non-markdown files)

This PR is modifying both Cargo.toml and non-markdown files.
The Release Checker is not able to analyse files that are not checked in to master. This might cause the above analysis to be inaccurate.
Please consider performing all the code changes in a separate PR before cutting the release.

Automatically created GitHub Release

A draft GitHub Release has been created.
It is going to be published when this PR is merged.
You can modify its' body to include any release notes you wish to include with the release.

@rvagg rvagg enabled auto-merge December 3, 2024 04:07
@rvagg rvagg added this pull request to the merge queue Dec 3, 2024
Merged via the queue into master with commit b6dd8b0 Dec 3, 2024
23 checks passed
@rvagg rvagg deleted the rvagg/v16.0.0-dev branch December 3, 2024 06:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: ☑️ Done (Archive)
Development

Successfully merging this pull request may close these issues.

2 participants