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

fix(katana): estimate message insufficient fee error #2549

Merged
merged 3 commits into from
Oct 16, 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
10 changes: 8 additions & 2 deletions crates/katana/rpc/rpc-types/src/message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ impl MsgFromL1 {
// for the `estimateMessageFee` RPC.
let nonce = Felt::ZERO;

// When executing a l1 handler tx, blockifier just assert that the paid_fee_on_l1 is
// anything but 0. See: https://github.com/dojoengine/sequencer/blob/d6951f24fc2082c7aa89cdbc063648915b131d74/crates/blockifier/src/transaction/transaction_execution.rs#L140-L145
//
// For fee estimation, this value is basically irrelevant.
let paid_fee_on_l1 = 1u128;

let message_hash = compute_l2_to_l1_message_hash(
// This conversion will never fail bcs `from_address` is 20 bytes and the it will only
// fail if the slice is > 32 bytes
Expand All @@ -25,9 +31,9 @@ impl MsgFromL1 {
nonce,
chain_id,
message_hash,
calldata: self.0.payload,
paid_fee_on_l1,
version: Felt::ZERO,
paid_fee_on_l1: Default::default(),
calldata: self.0.payload,
contract_address: self.0.to_address.into(),
entry_point_selector: self.0.entry_point_selector,
}
Expand Down
53 changes: 51 additions & 2 deletions crates/katana/rpc/rpc/tests/messaging.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ use std::time::Duration;
use alloy::primitives::{Uint, U256};
use alloy::providers::{ProviderBuilder, WalletProvider};
use alloy::sol;
use anyhow::Result;
use cainome::cairo_serde::EthAddress;
use cainome::rs::abigen;
use dojo_test_utils::sequencer::{get_default_test_config, TestSequencer};
use dojo_utils::TransactionWaiter;
use katana_core::service::messaging::MessagingConfig;
use katana_node::config::SequencingConfig;
use katana_primitives::felt;
use katana_primitives::utils::transaction::{
compute_l1_handler_tx_hash, compute_l1_to_l2_message_hash, compute_l2_to_l1_message_hash,
};
Expand All @@ -19,8 +21,8 @@ use rand::Rng;
use starknet::accounts::{Account, ConnectedAccount};
use starknet::contract::ContractFactory;
use starknet::core::types::{
BlockId, BlockTag, ContractClass, Felt, Hash256, Transaction, TransactionFinalityStatus,
TransactionReceipt,
BlockId, BlockTag, ContractClass, Felt, Hash256, MsgFromL1, Transaction,
TransactionFinalityStatus, TransactionReceipt,
};
use starknet::core::utils::get_contract_address;
use starknet::macros::selector;
Expand Down Expand Up @@ -300,3 +302,50 @@ async fn test_messaging() {
assert_eq!(msg_fee._0, U256::ZERO, "msg fee must be zero after consuming");
}
}

#[tokio::test]
async fn estimate_message_fee() -> Result<()> {
let config = get_default_test_config(SequencingConfig::default());
let sequencer = TestSequencer::start(config).await;

let provider = sequencer.provider();
let account = sequencer.account();

// Declare and deploy a l1 handler contract
let path = PathBuf::from("tests/test_data/cairo_l1_msg_contract.json");
let (contract, compiled_hash) = common::prepare_contract_declaration_params(&path)?;
let class_hash = contract.class_hash();

let res = account.declare_v2(contract.into(), compiled_hash).send().await?;
TransactionWaiter::new(res.transaction_hash, account.provider()).await?;

// Deploy the contract using UDC
let res = ContractFactory::new(class_hash, &account)
.deploy_v1(Vec::new(), Felt::ZERO, false)
.send()
.await?;

TransactionWaiter::new(res.transaction_hash, account.provider()).await?;

// Compute the contract address of the l1 handler contract
let l1handler_address = get_contract_address(Felt::ZERO, class_hash, &[], Felt::ZERO);

// Attempt to estimate the cost of calling a #[l1handler] function

let entry_point_selector = selector!("msg_handler_value");
let payload = vec![felt!("0x123"), felt!("123")]; // function arguments
let from_address = felt!("0x1337");
let to_address = l1handler_address;

let msg = MsgFromL1 {
payload,
to_address,
entry_point_selector,
from_address: from_address.try_into()?,
};

let result = provider.estimate_message_fee(msg, BlockId::Tag(BlockTag::Pending)).await;
assert!(result.is_ok());

Ok(())
}
2 changes: 0 additions & 2 deletions crates/katana/rpc/rpc/tests/starknet.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![allow(deprecated)]

use std::fs::{self};
use std::path::PathBuf;
use std::sync::Arc;
Expand Down
Loading