Skip to content

Commit 746570e

Browse files
committed
Update to FVM 3.0.0-alpha.17
1 parent 047dc5c commit 746570e

File tree

4 files changed

+10
-12
lines changed

4 files changed

+10
-12
lines changed

rust/Cargo.lock

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

rust/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ serde_json = "1.0.46"
3434
memmap = "0.7"
3535
rust-gpu-tools = { version = "0.5", optional = true, default-features = false }
3636
fr32 = { version = "~5.0", default-features = false }
37-
fvm3 = { package = "fvm", version = "3.0.0-alpha.16", default-features = false }
37+
fvm3 = { package = "fvm", version = "3.0.0-alpha.17", default-features = false }
3838
fvm3_shared = { package = "fvm_shared", version = "3.0.0-alpha.15" }
3939
fvm3_ipld_encoding = { package = "fvm_ipld_encoding", version = "0.3.2" }
4040
fvm2 = { package = "fvm", version = "2.1.0", default-features = false }

rust/src/fvm/engine.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,7 @@ mod v2 {
286286
compute_gas: Gas::from_milligas(
287287
charge.compute_gas.as_milligas(),
288288
),
289-
storage_gas: Gas::from_milligas(
290-
charge.storage_gas.as_milligas(),
291-
),
289+
other_gas: Gas::from_milligas(charge.storage_gas.as_milligas()),
292290
elapsed: Default::default(), // no timing information for v2.
293291
}))
294292
}

rust/src/fvm/machine.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -448,14 +448,14 @@ fn build_lotus_trace(
448448
ExecutionEvent::GasCharge(GasCharge {
449449
name,
450450
compute_gas,
451-
storage_gas,
451+
other_gas,
452452
elapsed: _, // TODO: thread timing through to lotus.
453453
}) => {
454454
new_trace.gas_charges.push(LotusGasCharge {
455455
name,
456-
total_gas: (compute_gas + storage_gas).round_up(),
456+
total_gas: (compute_gas + other_gas).round_up(),
457457
compute_gas: compute_gas.round_up(),
458-
storage_gas: storage_gas.round_up(),
458+
storage_gas: other_gas.round_up(),
459459
});
460460
}
461461
_ => (), // ignore unknown events.

0 commit comments

Comments
 (0)