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: update FVM #4859

Merged
merged 9 commits into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
61 changes: 28 additions & 33 deletions Cargo.lock

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

32 changes: 17 additions & 15 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion scripts/devnet-curio/check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/devnet/check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/cli/subcommands/send_cmd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
};

Expand Down
10 changes: 7 additions & 3 deletions src/shim/address.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion src/wallet/subcommands/wallet_cmd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
};

Expand Down
Loading