chore: update FVM (#4859)

ChainSafe · Oct 9, 2024 · 00c52a4 · 00c52a4
1 parent 1e0f11c
commit 00c52a4
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 55 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -48,29 +48,29 @@ directories = "5"
 displaydoc = "0.2"
 ethereum-types = "0.15"
 ez-jsonrpc-types = "0.3"
-fil_actor_account_state = { version = "17.0.0" }
-fil_actor_cron_state = { version = "17.0.0" }
-fil_actor_datacap_state = { version = "17.0.0" }
-fil_actor_init_state = { version = "17.0.0" }
-fil_actor_interface = { version = "17.0.0" }
-fil_actor_market_state = { version = "17.0.0" }
-fil_actor_miner_state = { version = "17.0.0" }
-fil_actor_power_state = { version = "17.0.0" }
-fil_actor_reward_state = { version = "17.0.0" }
-fil_actor_system_state = { version = "17.0.0" }
-fil_actor_verifreg_state = { version = "17.0.0" }
-fil_actors_shared = { version = "17.0.0", features = ["json"] }
+fil_actor_account_state = { version = "17.0.2" }
+fil_actor_cron_state = { version = "17.0.2" }
+fil_actor_datacap_state = { version = "17.0.2" }
+fil_actor_init_state = { version = "17.0.2" }
+fil_actor_interface = { version = "17.0.2" }
+fil_actor_market_state = { version = "17.0.2" }
+fil_actor_miner_state = { version = "17.0.2" }
+fil_actor_power_state = { version = "17.0.2" }
+fil_actor_reward_state = { version = "17.0.2" }
+fil_actor_system_state = { version = "17.0.2" }
+fil_actor_verifreg_state = { version = "17.0.2" }
+fil_actors_shared = { version = "17.0.2", features = ["json"] }
 flume = "0.11"
 fs_extra = "1"
 futures = "0.3"
 fvm2 = { package = "fvm", version = "~2.8", default-features = false }
 fvm3 = { package = "fvm", default-features = false, version = "~3.10", features = ["arb"] }
-fvm4 = { package = "fvm", default-features = false, version = "~4.3.1", features = ["arb", "verify-signature"] }
+fvm4 = { package = "fvm", default-features = false, version = "~4.3.3", features = ["arb", "verify-signature"] }
 fvm_ipld_blockstore = "0.2"
 fvm_ipld_encoding = "0.4"
 fvm_shared2 = { package = "fvm_shared", version = "~2.7" }
-fvm_shared3 = { package = "fvm_shared", version = "~3.10", features = ["arb", "testing", "proofs"] }
-fvm_shared4 = { package = "fvm_shared", version = "~4.3.1", features = ["arb", "testing", "proofs"] }
+fvm_shared3 = { package = "fvm_shared", version = "~3.10", features = ["arb", "proofs"] }
+fvm_shared4 = { package = "fvm_shared", version = "~4.3.3", features = ["arb", "proofs"] }
 gethostname = "0.5"
 git-version = "0.3"
 group = "0.13"
@@ -213,6 +213,8 @@ cargo_metadata = "0.18"
 criterion = { version = "0.5", features = ["async_tokio", "csv"] }
 cs_serde_bytes = "0.12"
 derive-quickcheck-arbitrary = "0.1"
+fvm_shared3 = { package = "fvm_shared", version = "~3.10", features = ["arb", "proofs", "testing"] }
+fvm_shared4 = { package = "fvm_shared", version = "~4.3.3", features = ["arb", "proofs", "testing"] }
 glob = "0.3"
 http-range-header = "0.4"
 insta = { version = "1", features = ["yaml"] }

diff --git a/scripts/devnet-curio/check.sh b/scripts/devnet-curio/check.sh
@@ -26,7 +26,7 @@ function get_f3_latest_cert_instance {
 }
 
 start_time=$(date +%s)
-timeout=$((start_time + 300))  # Set timeout to 10 minutes
+timeout=$((start_time + 300))  # Set timeout to 5 minutes
 
 # Target height set so that all migrations are applied.
 target_height=$TARGET_HEIGHT

diff --git a/scripts/devnet/check.sh b/scripts/devnet/check.sh
@@ -26,7 +26,7 @@ function get_f3_latest_cert_instance {
 }
 
 start_time=$(date +%s)
-timeout=$((start_time + 300))  # Set timeout to 10 minutes
+timeout=$((start_time + 300))  # Set timeout to 5 minutes
 
 # Target height set so that all migrations are applied.
 target_height=$TARGET_HEIGHT

diff --git a/src/cli/subcommands/send_cmd.rs b/src/cli/subcommands/send_cmd.rs
@@ -53,7 +53,6 @@ impl SendCommand {
             gas_limit: self.gas_limit as u64,
             gas_fee_cap: self.gas_feecap.clone(),
             gas_premium: self.gas_premium.clone(),
-            // JANK(aatifsyed): Why are we using a testing build of fvm_shared?
             ..Default::default()
         };
 

diff --git a/src/shim/address.rs b/src/shim/address.rs
@@ -110,13 +110,17 @@ mod network_guard_impl {
 /// parse both versions and discard the prefix. See also [`StrictAddress`].
 ///
 /// For more information, see: <https://spec.filecoin.io/appendix/address/>
-#[derive(
-    Copy, Clone, Debug, Default, Hash, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize,
-)]
+#[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
 #[serde(transparent)]
 #[cfg_attr(test, derive(derive_quickcheck_arbitrary::Arbitrary))]
 pub struct Address(Address_latest);
 
+impl Default for Address {
+    fn default() -> Self {
+        Address(Address_latest::new_id(0))
+    }
+}
+
 impl Address {
     pub const SYSTEM_ACTOR: Address = Address::new_id(0);
     pub const INIT_ACTOR: Address = Address::new_id(1);

diff --git a/src/wallet/subcommands/wallet_cmd.rs b/src/wallet/subcommands/wallet_cmd.rs
@@ -501,7 +501,6 @@ impl WalletCommands {
                     gas_limit: gas_limit as u64,
                     gas_fee_cap: gas_feecap,
                     gas_premium,
-                    // JANK(aatifsyed): Why are we using a testing build of fvm_shared?
                     ..Default::default()
                 };