From 00c52a4c75d3387c9d5d1ec5ea1310c434b1e26d Mon Sep 17 00:00:00 2001 From: Hubert Date: Wed, 9 Oct 2024 15:24:31 +0200 Subject: [PATCH] chore: update FVM (#4859) --- Cargo.lock | 61 +++++++++++++--------------- Cargo.toml | 32 ++++++++------- scripts/devnet-curio/check.sh | 2 +- scripts/devnet/check.sh | 2 +- src/cli/subcommands/send_cmd.rs | 1 - src/shim/address.rs | 10 +++-- src/wallet/subcommands/wallet_cmd.rs | 1 - 7 files changed, 54 insertions(+), 55 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 89abba7d5bcd..9bfd59bdda17 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2668,9 +2668,9 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "fil_actor_account_state" -version = "17.0.0" +version = "17.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b52e7f0eae0bb799774c4d2f72d6c31a149456cdd08c820cea1e0f38db5643d" +checksum = "77a5f165ebc1d8b0f1e71af266f3bcf4a1b3def411584935d0982f0521218da5" dependencies = [ "frc42_macros", "fvm_ipld_encoding", @@ -2684,9 +2684,9 @@ dependencies = [ [[package]] name = "fil_actor_cron_state" -version = "17.0.0" +version = "17.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "289491e1b352f84d641a9f2b22149526ee37a493d056956f2314545a075cd641" +checksum = "fc84f1e5eeffae031ee3dddacd49dd488484657f7171f46292bd9123ff8efe1e" dependencies = [ "fvm_ipld_encoding", "fvm_shared 2.7.0", @@ -2699,9 +2699,9 @@ dependencies = [ [[package]] name = "fil_actor_datacap_state" -version = "17.0.0" +version = "17.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "987a1fcf02e5ee9e6ea5c92f8d880ec01b4071b4bc96a3df3059a48ef4591c3b" +checksum = "0f6ea5d5fd99fb0f444ee5f0878eb98ccf199d94f31ff7a17d72957c612a83cf" dependencies = [ "fil_actors_shared", "frc42_macros", @@ -2719,9 +2719,9 @@ dependencies = [ [[package]] name = "fil_actor_evm_state" -version = "17.0.0" +version = "17.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b0ee0df13acfd107aa4920e25ab6caae3906c61efca5563b490c4cc20307b4" +checksum = "268da7d20a8b8bc925e2bc0c9b4c6125654de9b4813b1db8f225eb3d6503717f" dependencies = [ "cid", "fil_actors_shared", @@ -2739,9 +2739,9 @@ dependencies = [ [[package]] name = "fil_actor_init_state" -version = "17.0.0" +version = "17.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfc2b2fb6b5b965cf4daafae4daef7722b984734d0f018dda9990b9bd0b3b08b" +checksum = "c2d6f8c68ee37366edbabb851a895b505b5714dab9bccc286c25f7c1e9317244" dependencies = [ "anyhow", "cid", @@ -2760,9 +2760,9 @@ dependencies = [ [[package]] name = "fil_actor_interface" -version = "17.0.0" +version = "17.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8193752bd5a007ab92fb185b690392d8ae41ff7fac9414035b714736f5eecab7" +checksum = "e85fed6bcf4ce9a92eb00cd7db2f08f555ada8e5e812977cf1cfef8c62ae294a" dependencies = [ "anyhow", "cid", @@ -2786,20 +2786,16 @@ dependencies = [ "fvm_shared 3.10.0", "fvm_shared 4.3.3", "integer-encoding", - "lazy_static", "multihash 0.18.1", "num", - "once_cell", - "regex", "serde", - "serde_json", ] [[package]] name = "fil_actor_market_state" -version = "17.0.0" +version = "17.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b488e62af8fae7c70528ea65413bc487f3ea77178957f4b0790570493c8406e5" +checksum = "15fc4c3b627e0795a32e5ee4e9415de49a020863cf0e6929fcaf9154a45c2003" dependencies = [ "anyhow", "cid", @@ -2824,9 +2820,9 @@ dependencies = [ [[package]] name = "fil_actor_miner_state" -version = "17.0.0" +version = "17.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aa5564d23b4ce2b68c8a5d8eead9f2a129d059fccc31b92335b17728ec437cf" +checksum = "9bc072706e39e4ffd170a928ee75a17eb4f266026f51c317d2b3227efa04d340" dependencies = [ "anyhow", "bitflags 2.6.0", @@ -2855,9 +2851,9 @@ dependencies = [ [[package]] name = "fil_actor_multisig_state" -version = "17.0.0" +version = "17.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ddbda8df4d601d4bcd4d31aa8777ebff9bd99fd1674622cfc43fd6a537d2080" +checksum = "16a8aff23f4b2525792e9a556f2d61a8640475e927050ce7d63ac652490168a8" dependencies = [ "anyhow", "cid", @@ -2879,9 +2875,9 @@ dependencies = [ [[package]] name = "fil_actor_power_state" -version = "17.0.0" +version = "17.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7036ba5cf4fbbf87bab2f29c2bf0a0d27e3279b090315595136605728a46fc7" +checksum = "988428874157dbcb1b8857e099f0ab729f0481c84013a30eb3bdfac9243b663b" dependencies = [ "anyhow", "cid", @@ -2903,9 +2899,9 @@ dependencies = [ [[package]] name = "fil_actor_reward_state" -version = "17.0.0" +version = "17.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ff96363a23bcc1526ad7a65e043764fdb981a20f2fd6f0d66148014f5d2fa87" +checksum = "2277e017765305b6251e7c93a953328c4ee15164a8a88cecc04e97d72ba2830a" dependencies = [ "fil_actor_miner_state", "fil_actors_shared", @@ -2921,9 +2917,9 @@ dependencies = [ [[package]] name = "fil_actor_system_state" -version = "17.0.0" +version = "17.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f39dfddda827ca9531580438d9bc8fec535631aca489d871967e3c4241f56bfa" +checksum = "0f9dd1ac9379f229fbfe8d858233f3edd1965e9a4a9ced67e6bbe333c1abe729" dependencies = [ "cid", "fil_actors_shared", @@ -2938,9 +2934,9 @@ dependencies = [ [[package]] name = "fil_actor_verifreg_state" -version = "17.0.0" +version = "17.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8dbe228504cd35f5ba500d1ec4997bc8c362bb5ebf8000678c9a9622c68b44" +checksum = "b95a6b548043c88ecb2781cd3085d11f9333a688d34b9044de348d880ba62737" dependencies = [ "anyhow", "cid", @@ -2960,9 +2956,9 @@ dependencies = [ [[package]] name = "fil_actors_shared" -version = "17.0.0" +version = "17.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754e8c3b98ff7941ff907804b56cc159936c91767eb853f852658971a97ac388" +checksum = "81a437df902bbfd2a4aac3b6c02c15999d5654eea6c6442a5a638e2d35784160" dependencies = [ "anyhow", "cid", @@ -2988,7 +2984,6 @@ dependencies = [ "regex", "serde", "serde_repr", - "sha2 0.10.8", "thiserror", "unsigned-varint 0.8.0", ] diff --git a/Cargo.toml b/Cargo.toml index 2e933bcf3ff2..5eb1122a697c 100644 --- 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 index 0bd8462df6cd..da6a710f1fe9 100755 --- 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 index 735395fd2a57..479965491bc8 100755 --- 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 index bbce8601a8ad..10ef7cd30521 100644 --- 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 index 2fb0ca9198fd..3e5493f60f4d 100644 --- 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: -#[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 index 8fe4c81a9f38..62baa7d897ab 100644 --- 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() };