Update blockifier and add support for SkipFeeCharge flag

Author: omerfirmak

mocks/mock_vm.go

@@ -1130,7 +1130,7 @@ func (h *Handler) EstimateFee(broadcastedTxns []BroadcastedTransaction, id Block
 	if sequencerAddress == nil {
 		sequencerAddress = core.NetworkBlockHashMetaInfo(h.network).FallBackSequencerAddress
 	}
-	gasesConsumed, err := h.vm.Execute(txns, classes, blockNumber, header.Timestamp, sequencerAddress, state, h.network, paidFeesOnL1)
+	gasesConsumed, err := h.vm.Execute(txns, classes, blockNumber, header.Timestamp, sequencerAddress, state, h.network, paidFeesOnL1, true)
 	if err != nil {
 		rpcErr := *ErrContractError
 		rpcErr.Data = err.Error()

rpc/handlers.go

@@ -2014,9 +2014,10 @@ func TestEstimateMessageFee(t *testing.T) {
 	mockReader.EXPECT().HeadsHeader().Return(latestHeader, nil)
 
 	expectedGasConsumed := new(felt.Felt).SetUint64(37)
-	mockVM.EXPECT().Execute(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).DoAndReturn(
+	mockVM.EXPECT().Execute(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).DoAndReturn(
 		func(txns []core.Transaction, declaredClasses []core.Class, blockNumber, blockTimestamp uint64,
 			sequencerAddress *felt.Felt, state core.StateReader, network utils.Network, paidFeesOnL1 []*felt.Felt,
+			skipChargeFee bool,
 		) ([]*felt.Felt, error) {
 			require.Len(t, txns, 1)
 			assert.NotNil(t, txns[0].(*core.L1HandlerTransaction))

rpc/handlers_test.go

@@ -6,9 +6,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-serde = "1.0.160"
+serde = "1.0.171"
 serde_json = { version = "1.0.96", features = ["raw_value"] }
-blockifier = {git = "https://github.com/starkware-libs/blockifier", rev = "4cd75c7e6d8e5534cbf9074d7a7d0192283266d7"}
+blockifier = {git = "https://github.com/starkware-libs/blockifier", rev = "5ba0fb4"}
 starknet_api = { git = "https://github.com/starkware-libs/starknet-api", rev = "8f620bc" }
 cairo-vm = "0.8.2"
 cairo-lang-casm = "2.1.0"

vm/rust/Cargo.toml

@@ -128,6 +128,7 @@ pub extern "C" fn cairoVMExecute(
     chain_id: *const c_char,
     sequencer_address: *const c_uchar,
     paid_fees_on_l1_json: *const c_char,
+    skip_charge_fee: c_uchar,
 ) {
     let reader = JunoStateReader::new(reader_handle);
     let chain_id_str = unsafe { CStr::from_ptr(chain_id) }.to_str().unwrap();
@@ -211,10 +212,11 @@ pub extern "C" fn cairoVMExecute(
             return;
         }
 
+        let charge_fee = skip_charge_fee == 0;
         let res = match txn.unwrap() {
-            Transaction::AccountTransaction(t) => t.execute(&mut state, &block_context),
+            Transaction::AccountTransaction(t) => t.execute(&mut state, &block_context, charge_fee),
             Transaction::L1HandlerTransaction(t) => {
-                let maybe_execution_info = t.execute(&mut state, &block_context);
+                let maybe_execution_info = t.execute(&mut state, &block_context, charge_fee);
                 if maybe_execution_info.is_err() {
                     maybe_execution_info
                 } else {

vm/rust/src/lib.rs

@@ -8,7 +8,8 @@ package vm
 //					char* chain_id);
 //
 // extern void cairoVMExecute(char* txns_json, char* classes_json, uintptr_t readerHandle, unsigned long long block_number,
-//					unsigned long long block_timestamp, char* chain_id, char* sequencer_address, char* paid_fees_on_l1_json);
+//					unsigned long long block_timestamp, char* chain_id, char* sequencer_address, char* paid_fees_on_l1_json,
+//					unsigned char skip_charge_fee);
 //
 // #cgo LDFLAGS: -L./rust/target/release -ljuno_starknet_rs -lm -ldl
 import "C"
@@ -31,6 +32,7 @@ type VM interface {
 	) ([]*felt.Felt, error)
 	Execute(txns []core.Transaction, declaredClasses []core.Class, blockNumber, blockTimestamp uint64,
 		sequencerAddress *felt.Felt, state core.StateReader, network utils.Network, paidFeesOnL1 []*felt.Felt,
+		skipChargeFee bool,
 	) ([]*felt.Felt, error)
 }
 
@@ -134,6 +136,7 @@ func (*vm) Call(contractAddr, selector *felt.Felt, calldata []felt.Felt, blockNu
 // Execute executes a given transaction set and returns the gas spent per transaction
 func (*vm) Execute(txns []core.Transaction, declaredClasses []core.Class, blockNumber, blockTimestamp uint64,
 	sequencerAddress *felt.Felt, state core.StateReader, network utils.Network, paidFeesOnL1 []*felt.Felt,
+	skipChargeFee bool,
 ) ([]*felt.Felt, error) {
 	context := &callContext{
 		state: state,
@@ -156,6 +159,11 @@ func (*vm) Execute(txns []core.Transaction, declaredClasses []core.Class, blockN
 	classesJSONCStr := C.CString(string(classesJSON))
 
 	sequencerAddressBytes := sequencerAddress.Bytes()
+	var skipChargeFeeByte byte
+	if skipChargeFee {
+		skipChargeFeeByte = 1
+	}
+
 	chainID := C.CString(network.ChainIDString())
 	C.cairoVMExecute(txnsJSONCstr,
 		classesJSONCStr,
@@ -164,7 +172,9 @@ func (*vm) Execute(txns []core.Transaction, declaredClasses []core.Class, blockN
 		C.ulonglong(blockTimestamp),
 		chainID,
 		(*C.char)(unsafe.Pointer(&sequencerAddressBytes[0])),
-		paidFeesOnL1CStr)
+		paidFeesOnL1CStr,
+		C.uchar(skipChargeFeeByte),
+	)
 
 	C.free(unsafe.Pointer(classesJSONCStr))
 	C.free(unsafe.Pointer(paidFeesOnL1CStr))