Skip to content
This repository has been archived by the owner on Aug 2, 2024. It is now read-only.

add: from_address in l1 message calldata #1451

Merged
merged 5 commits into from
Feb 19, 2024
Merged
Show file tree
Hide file tree
Changes from 4 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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -292,3 +292,4 @@
- dev: Get the block status from the actual block in get_block_with_tx_hashes
- fix: l1-l2 messaging
- dev : clean contracts and compiled files
- fix: add from_address in calldata of l1 message
21 changes: 15 additions & 6 deletions crates/client/l1-messages/src/contract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,19 @@ pub enum L1EventToTransactionError {
InvalidContractAddress(Felt252WrapperError),
#[error("Failed to convert Entrypoint Selector from L1 Event: `{0}`")]
InvalidEntryPointSelector(Felt252WrapperError),
#[error("Failed to convert From Address from L1 Event: `{0}`")]
InvalidFromAddress(Felt252WrapperError),
#[error("Failed to convert Nonce param from L1 Event: `{0}`")]
InvalidNonce(Felt252WrapperError),
}

pub fn parse_handle_l1_message_transaction(
event: LogMessageToL2Filter,
) -> Result<HandleL1MessageTransaction, L1EventToTransactionError> {
// L1 from address.
let from_address = Felt252Wrapper::try_from(sp_core::U256::from_big_endian(event.from_address.as_bytes()))
.map_err(L1EventToTransactionError::InvalidFromAddress)?;

// L2 contract to call.
let contract_address = Felt252Wrapper::try_from(sp_core::U256(event.to_address.0))
.map_err(L1EventToTransactionError::InvalidContractAddress)?;
Expand All @@ -32,12 +38,15 @@ pub fn parse_handle_l1_message_transaction(
.try_into()
.map_err(L1EventToTransactionError::InvalidNonce)?;

let calldata: Vec<Felt252Wrapper> = event
.payload
.iter()
.map(|param| Felt252Wrapper::try_from(sp_core::U256(param.0)))
.collect::<Result<Vec<Felt252Wrapper>, Felt252WrapperError>>()
.map_err(L1EventToTransactionError::InvalidCalldata)?;
let mut calldata: Vec<Felt252Wrapper> = vec![from_address];
calldata.extend(
event
.payload
.iter()
.map(|param| Felt252Wrapper::try_from(sp_core::U256(param.0)))
.collect::<Result<Vec<Felt252Wrapper>, Felt252WrapperError>>()
.map_err(L1EventToTransactionError::InvalidCalldata)?,
);

Ok(HandleL1MessageTransaction { nonce, contract_address, entry_point_selector, calldata })
}
Loading