Skip to content

Commit e0c5892

Browse files
authored
Merge pull request #422 from filecoin-project/steb/fvm-v4
update fvm to v4 alpha.4
2 parents 4994d3e + 57c75b6 commit e0c5892

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

rust/Cargo.lock

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

rust/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ anyhow = "1.0.23"
3333
serde_json = "1.0.46"
3434
rust-gpu-tools = { version = "0.7", optional = true, default-features = false }
3535
fr32 = { version = "9.0.0", default-features = false }
36-
fvm4 = { package = "fvm", version = "~4.0.0-alpha.2", default-features = false }
37-
fvm4_shared = { package = "fvm_shared", version = "~4.0.0-alpha.2" }
36+
fvm4 = { package = "fvm", version = "~4.0.0-alpha.4", default-features = false }
37+
fvm4_shared = { package = "fvm_shared", version = "~4.0.0-alpha.4" }
3838
fvm3 = { package = "fvm", version = "~3.8.0", default-features = false }
3939
fvm3_shared = { package = "fvm_shared", version = "~3.6.0" }
4040
fvm2 = { package = "fvm", version = "~2.7", default-features = false }

rust/src/fvm/engine.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ mod v3 {
268268

269269
use fvm4::call_manager::{backtrace::Backtrace, backtrace::Cause, backtrace::Frame};
270270
use fvm4::executor::{ApplyFailure, ApplyKind, ApplyRet};
271-
use fvm4::gas::{Gas, GasCharge};
271+
use fvm4::gas::{Gas, GasCharge, GasDuration};
272272
use fvm4::kernel::SyscallError;
273273

274274
use fvm4::trace::ExecutionEvent;
@@ -389,9 +389,12 @@ mod v3 {
389389
charge.compute_gas.as_milligas(),
390390
),
391391
other_gas: Gas::from_milligas(charge.other_gas.as_milligas()),
392-
// TODO: There's no way to convert at the moment without a
393-
// transmute.
394-
elapsed: Default::default(),
392+
elapsed: charge
393+
.elapsed
394+
.get()
395+
.copied()
396+
.map(GasDuration::from)
397+
.unwrap_or_default(),
395398
}))
396399
}
397400
ExecutionEvent3::Call {

0 commit comments

Comments
 (0)