Fix fee estimation in simulateTransactions, fix DataAvailability pric…

…es in traces (#1745)
NethermindEth · Mar 14, 2024 · 6317b0d · 6317b0d
1 parent bf96204
commit 6317b0d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/rpc/handlers.go b/rpc/handlers.go
@@ -1664,10 +1664,7 @@ func (h *Handler) simulateTransactions(id BlockID, transactions []BroadcastedTra
 		if !v0_6Response {
 			trace := traces[i]
 			executionResources := trace.TotalExecutionResources()
-			executionResources.DataAvailability = &vm.DataAvailability{
-				L1Gas:     gasConsumed.Uint64(),
-				L1DataGas: dataGasConsumed[i].Uint64(),
-			}
+			executionResources.DataAvailability = vm.NewDataAvailability(gasConsumed, dataGasConsumed[i], header.L1DAMode)
 			traces[i].ExecutionResources = executionResources
 		}
 
@@ -1819,10 +1816,8 @@ func (h *Handler) traceBlockTransactions(ctx context.Context, block *core.Block,
 			gasConsumed = gasConsumed.Div(gasConsumed, gasPrice) // division by zero felt is zero felt
 
 			executionResources := trace.TotalExecutionResources()
-			executionResources.DataAvailability = &vm.DataAvailability{
-				L1Gas:     gasConsumed.Uint64(),
-				L1DataGas: dataGasConsumed[index].Uint64(),
-			}
+			executionResources.DataAvailability = vm.NewDataAvailability(gasConsumed, dataGasConsumed[index],
+				header.L1DAMode)
 			traces[index].ExecutionResources = executionResources
 		}
 		result = append(result, TracedBlockTransaction{

diff --git a/vm/rust/src/lib.rs b/vm/rust/src/lib.rs
@@ -282,7 +282,7 @@ pub extern "C" fn cairoVMExecute(
                 }
 
                 // we are estimating fee, override actual fee calculation
-                if !charge_fee {
+                if  t.actual_fee.0 == 0 {
                     t.actual_fee = calculate_tx_fee(&t.actual_resources, &block_context, &fee_type).unwrap();
                 }
 

diff --git a/vm/trace.go b/vm/trace.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"slices"
 
+	"github.com/NethermindEth/juno/core"
 	"github.com/NethermindEth/juno/core/felt"
 )
 
@@ -242,3 +243,16 @@ type ExecutionResources struct {
 	ComputationResources
 	DataAvailability *DataAvailability `json:"data_availability,omitempty"`
 }
+
+func NewDataAvailability(gasConsumed, dataGasConsumed *felt.Felt, mode core.L1DAMode) *DataAvailability {
+	da := &DataAvailability{}
+
+	switch mode {
+	case core.Calldata:
+		da.L1Gas = gasConsumed.Uint64()
+	case core.Blob:
+		da.L1DataGas = dataGasConsumed.Uint64()
+	}
+
+	return da
+}