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.

Sign up for GitHub

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

Jump to bottom

Refactor felt #143

Merged
merged 20 commits into from
Jun 10, 2024
Merged

Refactor felt #143

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
5a540b8
minor (import)
Ophiase Jun 4, 2024
2012432
half of the refactor on computer_hash done
Ophiase Jun 5, 2024
262cc80
minor fix
Ophiase Jun 5, 2024
0a7c05e
DeclareTransactionV0V1 converted to Felt
Ophiase Jun 5, 2024
cb35d85
DeclareTransactionV2 converted to Felt
Ophiase Jun 5, 2024
095c500
DeclareTransactionV3 done + fix into InvokeTransactionV3
Ophiase Jun 5, 2024
be5834e
DeployAccountTransactionV1 converted to Felt
Ophiase Jun 5, 2024
082472f
DeployTransaction.ComputeTransactionHash as a Felt
Ophiase Jun 5, 2024
da51df6
DeployAccountTransactionV3.compute_hash as felt
Ophiase Jun 5, 2024
e13c22d
compute_hash.rs converted as Felt
Ophiase Jun 5, 2024
3e7cf2e
removed redundancy (compute_calldata_hash, compute_gas_hash, compute_…
Ophiase Jun 5, 2024
1b0a90b
refactor: on compute_hash as Felt
Ophiase Jun 6, 2024
1207743
changelog: felt-refactor
Ophiase Jun 6, 2024
43c51f0
Merge remote-tracking branch 'upstream/main' into refactor_felt
Ophiase Jun 7, 2024
5ace61c
migrated block hash to correct hasher
antiyro Jun 7, 2024
9576ede
removed hashers
antiyro Jun 7, 2024
feea05e
fixed ci
antiyro Jun 7, 2024
3e9f2fc
fixed ci
antiyro Jun 7, 2024
e24c395
runned udeps and machete
antiyro Jun 7, 2024
7bceff8
fixed hashes
antiyro Jun 10, 2024
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
Prev Previous commit
Next Next commit
DeclareTransactionV3 done + fix into InvokeTransactionV3
  • Loading branch information
@Ophiase
Ophiase committed Jun 5, 2024
commit 095c500e3c92113711930563dd0849baea7f2bd8
54 changes: 30 additions & 24 deletions crates/primitives/transactions/src/compute_hash.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ impl ComputeTransactionHash for InvokeTransactionV3 {
if offset_version { SIMULATE_TX_VERSION_OFFSET_FELT + Felt::THREE } else { Felt::THREE };
let sender_address = Felt::from_bytes_be(&self.sender_address.0.0.0);

// self.tip.0 is a u64
let felt_tmp_a = Felt::try_from(self.tip.0).unwrap();
let felt_tmp_b = prepare_resource_bound_value_as_felt(&self.resource_bounds, Resource::L1Gas);
let felt_tmp_c = prepare_resource_bound_value_as_felt(&self.resource_bounds, Resource::L2Gas);
Expand All @@ -224,7 +223,7 @@ impl ComputeTransactionHash for InvokeTransactionV3 {

let data_hash = {
let account_deployment_data_tmp =
&self.account_deployment_data.0.iter().map(|f| Felt252Wrapper::from(*f).into()).collect::<Vec<_>>();
&self.account_deployment_data.0.iter().map(|f| Felt::from_bytes_be(&f.0)).collect::<Vec<_>>();
let account_deployment_data_tmp_bis = account_deployment_data_tmp.as_slice();
let account_deployment_data_hash = Pedersen::hash_array(account_deployment_data_tmp_bis);

Expand Down Expand Up @@ -353,26 +352,34 @@ impl ComputeTransactionHash for DeclareTransactionV3 {
offset_version: bool,
_block_number: Option<u64>,
) -> TransactionHash {
let prefix = FieldElement::from_byte_slice_be(DECLARE_PREFIX).unwrap();
let prefix = Felt::from_bytes_be_slice(DECLARE_PREFIX);
let version =
if offset_version { SIMULATE_TX_VERSION_OFFSET + FieldElement::THREE } else { FieldElement::THREE };
let sender_address = Felt252Wrapper::from(self.sender_address).into();
let gas_hash = compute_hash_on_elements(&[
FieldElement::from(self.tip.0),
prepare_resource_bound_value(&self.resource_bounds, Resource::L1Gas),
prepare_resource_bound_value(&self.resource_bounds, Resource::L2Gas),
]);
let paymaster_hash = compute_hash_on_elements(
&self.paymaster_data.0.iter().map(|f| Felt252Wrapper::from(*f).into()).collect::<Vec<_>>(),
);
let nonce = Felt252Wrapper::from(self.nonce.0).into();
let data_availability_modes =
prepare_data_availability_modes(self.nonce_data_availability_mode, self.fee_data_availability_mode);
let account_deployment_data_hash = compute_hash_on_elements(
&self.account_deployment_data.0.iter().map(|f| Felt252Wrapper::from(*f).into()).collect::<Vec<_>>(),
);
if offset_version { SIMULATE_TX_VERSION_OFFSET_FELT + Felt::THREE } else { Felt::THREE };
let sender_address = Felt::from_bytes_be(&self.sender_address.0.0.0);

let felt_tmp_a = Felt::try_from(self.tip.0).unwrap();
let felt_tmp_b = prepare_resource_bound_value_as_felt(&self.resource_bounds, Resource::L1Gas);
let felt_tmp_c = prepare_resource_bound_value_as_felt(&self.resource_bounds, Resource::L2Gas);
let gas_as_felt = &[felt_tmp_a, felt_tmp_b, felt_tmp_c];
let gas_hash = Pedersen::hash_array(gas_as_felt);

Felt252Wrapper(H::compute_hash_on_elements(&[
let paymaster_tmp =
&self.paymaster_data.0.iter().map(|f| Felt252Wrapper::from(*f).into()).collect::<Vec<_>>();
let paymaster_tmp_bis = paymaster_tmp.as_slice();
let paymaster_hash = Pedersen::hash_array(paymaster_tmp_bis);

let nonce = Felt::from_bytes_be(&self.nonce.0.0);
let data_availability_modes = prepare_data_availability_modes_as_felt(
self.nonce_data_availability_mode, self.fee_data_availability_mode
);


let account_deployment_data_tmp =
&self.account_deployment_data.0.iter().map(|f| Felt::from_bytes_be(&f.0)).collect::<Vec<_>>();
let account_deployment_data_tmp_bis = account_deployment_data_tmp.as_slice();
let account_deployment_data_hash = Pedersen::hash_array(account_deployment_data_tmp_bis);

TransactionHash(StarkFelt(Pedersen::hash_array(&[
prefix,
version,
sender_address,
Expand All @@ -382,10 +389,9 @@ impl ComputeTransactionHash for DeclareTransactionV3 {
nonce,
data_availability_modes,
account_deployment_data_hash,
Felt252Wrapper::from(self.class_hash).into(),
Felt252Wrapper::from(self.compiled_class_hash).into(),
]))
.into()
Felt::from_bytes_be(&self.class_hash.0.0),
Felt::from_bytes_be(&self.compiled_class_hash.0.0),
]).to_bytes_be()))
}
}

Expand Down