Skip to content

Commit

Permalink
feat: declare post compilation prime validation
Browse files Browse the repository at this point in the history
  • Loading branch information
ArniStarkware committed Jul 14, 2024
1 parent a5f6540 commit c834846
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 2 deletions.
14 changes: 14 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ async-trait = "0.1.79"
axum = "0.6.12"
blockifier = { git = "https://github.com/starkware-libs/blockifier.git", rev = "bad24f25" }
bincode = "1.3.3"
cairo-felt = "0.9.1"
cairo-lang-sierra = "2.7.0-dev.0"
cairo-lang-starknet-classes = "2.7.0-dev.0"
cairo-lang-utils = "2.7.0-dev.0"
Expand All @@ -49,8 +50,8 @@ hyper = { version = "0.14", features = ["client", "server", "http1", "http2", "t
indexmap = "2.1.0"
itertools = "0.13.0"
lazy_static = "1.4.0"
num-traits = "0.2"
num-bigint = { version = "0.4.5", default-features = false }
num-traits = "0.2"
# TODO(YaelD, 28/5/2024): The special Papyrus version is needed in order to be aligned with the
# starknet-api version. This should be removed once we have a mono-repo.
papyrus_common = { git = "https://github.com/starkware-libs/papyrus.git", rev = "ca83fd42" }
Expand Down
4 changes: 3 additions & 1 deletion crates/gateway/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ testing = []
[dependencies]
async-trait.workspace = true
axum.workspace = true
blockifier= { workspace = true , features = ["testing"] }
blockifier = { workspace = true , features = ["testing"] }
cairo-felt.workspace = true
cairo-lang-starknet-classes.workspace = true
cairo-vm.workspace = true
hyper.workspace = true
num-bigint.workspace = true
num-traits.workspace = true
papyrus_config.workspace = true
papyrus_rpc.workspace = true
Expand Down
12 changes: 12 additions & 0 deletions crates/gateway/src/compilation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@ use std::panic;
use std::sync::OnceLock;

use blockifier::execution::contract_class::{ClassInfo, ContractClass, ContractClassV1};
// TODO(Arni): Consider if you want to import a new crate just for a constant string.
use cairo_felt::PRIME_STR;
use cairo_lang_starknet_classes::casm_contract_class::{
CasmContractClass, CasmContractEntryPoints,
};
use num_bigint::BigUint;
use num_traits::Num;
use starknet_api::core::CompiledClassHash;
use starknet_api::rpc_transaction::RPCDeclareTransaction;
use starknet_sierra_compile::compile::compile_sierra_to_casm;
Expand Down Expand Up @@ -85,6 +89,14 @@ impl GatewayCompiler {
});
}
}

let prime = contract_class.prime.clone();
let expected_prime =
BigUint::from_str_radix(&PRIME_STR[2..], 16).expect("Error parsing field prime.");
if prime != expected_prime {
return Err(GatewayError::InvalidPrime { prime, expected_prime });
}

Ok(())
}
}
Expand Down
3 changes: 3 additions & 0 deletions crates/gateway/src/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use blockifier::execution::errors::ContractClassError;
use blockifier::state::errors::StateError;
use blockifier::transaction::errors::TransactionExecutionError;
use cairo_vm::types::errors::program_errors::ProgramError;
use num_bigint::BigUint;
use serde_json::{Error as SerdeError, Value};
use starknet_api::block::{BlockNumber, GasPrice};
use starknet_api::core::CompiledClassHash;
Expand Down Expand Up @@ -32,6 +33,8 @@ pub enum GatewayError {
DeclaredContractProgramError(#[from] ProgramError),
#[error("Internal server error: {0}")]
InternalServerError(#[from] JoinError),
#[error("Invalid value for field prime: {prime}. Expected: {expected_prime}")]
InvalidPrime { prime: BigUint, expected_prime: BigUint },
#[error("Error sending message: {0}")]
MessageSendError(String),
#[error(transparent)]
Expand Down

0 comments on commit c834846

Please sign in to comment.