Add/starknet hive with custom acc #269
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
WalkthroughThe pull request introduces modifications to the Changes
Sequence DiagramsequenceDiagram
participant Client
participant StarknetHive
participant ContractDeclaration
participant AccountCreation
Client->>StarknetHive: new_with_custom_account(node_url, paymaster_address, paymaster_key, sierra, casm)
StarknetHive->>ContractDeclaration: get_compiled_contract_from_string(sierra, casm)
ContractDeclaration-->>StarknetHive: Return compiled contract
StarknetHive->>AccountCreation: Create custom account
AccountCreation-->>StarknetHive: Account created
StarknetHive-->>Client: Return StarknetHive instance
Possibly related PRs
Poem
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 4
📜 Review details
Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro
📒 Files selected for processing (2)
openrpc-testgen/src/utils/starknet_hive.rs(5 hunks)openrpc-testgen/src/utils/v7/endpoints/declare_contract.rs(1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (2)
- GitHub Check: Run cargo_clippy - rust stable
- GitHub Check: Build project - rust stable
🔇 Additional comments (7)
openrpc-testgen/src/utils/v7/endpoints/declare_contract.rs (2)
146-150: LGTM! Improved error handling.The change from
unwrap()to the?operator enhances error propagation and makes the code more robust.
152-161: LGTM! Well-structured new function.The new function
get_compiled_contract_from_stringfollows good practices:
- Reuses existing logic
- Maintains consistent error handling
- Provides flexibility by accepting string inputs
openrpc-testgen/src/utils/starknet_hive.rs (5)
6-8: LGTM! Clean import organization.The new imports are well-organized and necessary for the added functionality.
Also applies to: 22-25
44-44: Verify impact of struct rename.The struct has been renamed from
StarkneHivetoStarknetHiveto fix the typo. This is a breaking change that could affect downstream code.✅ Verification successful
Rename from
StarkneHivetoStarknetHiveis safe to proceedThe struct rename is contained within a single file and there are no external references to the old name. This is a non-breaking change.
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Search for any remaining references to the old struct name rg "StarkneHive" -lLength of output: 19
Script:
#!/bin/bash # Search for current struct usage echo "=== Current StarknetHive usage ===" rg "StarknetHive" -A 2 # Check git history for this file echo -e "\n=== Git history for the file ===" git log -p -- openrpc-testgen/src/utils/starknet_hive.rs | head -n 50 # Look for struct usage patterns echo -e "\n=== Struct usage patterns ===" ast-grep --pattern 'struct StarknetHive'Length of output: 1510
Script:
#!/bin/bash # Check if the struct is imported anywhere echo "=== Checking imports ===" rg "use.*StarknetHive" -A 1 # Check git history with a different approach echo -e "\n=== Checking file history ===" git log --oneline -- openrpc-testgen/src/utils/starknet_hive.rs # Check if file exists in main/master branch echo -e "\n=== Checking file in main branch ===" git show main:openrpc-testgen/src/utils/starknet_hive.rs 2>&1 || echo "File not in main"Length of output: 6462
6-8: LGTM! Import changes are well-organized.The new imports are correctly structured and necessary for the added functionality.
Also applies to: 22-25
44-44: LGTM! Fixed typo in struct name.The struct name has been correctly updated from
StarkneHivetoStarknetHive.
Line range hint
235-337: LGTM! Implementation blocks are correctly updated.The trait implementations have been properly updated to use the new struct name
StarknetHive.
| ) | ||
| .await?; | ||
|
|
||
| let transfer_amount = Felt::from_hex("0xfffffffffffffff")?; |
There was a problem hiding this comment.
🧹 Nitpick (assertive)
Document magic numbers.
The hardcoded value 0xfffffffffffffff should be documented to explain its significance.
+ // Maximum transfer amount for initial account funding
let transfer_amount = Felt::from_hex("0xfffffffffffffff")?;📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| let transfer_amount = Felt::from_hex("0xfffffffffffffff")?; | |
| // Maximum transfer amount for initial account funding | |
| let transfer_amount = Felt::from_hex("0xfffffffffffffff")?; |
🧹 Nitpick (assertive)
Consider extracting magic number as a constant.
The transfer amount 0xfffffffffffffff should be defined as a named constant at the module level for better maintainability and documentation.
+ const DEFAULT_TRANSFER_AMOUNT: &str = "0xfffffffffffffff";
- let transfer_amount = Felt::from_hex("0xfffffffffffffff")?;
+ let transfer_amount = Felt::from_hex(DEFAULT_TRANSFER_AMOUNT)?;Committable suggestion skipped: line range outside the PR's diff.
Comment on lines
+115
to
+232
| paymaster_account.set_block_id(BlockId::Tag(BlockTag::Pending)); | ||
|
|
||
| let (flattened_sierra_class, compiled_class_hash) = | ||
| get_compiled_contract_from_string(sierra, casm).await?; | ||
|
|
||
| let custom_account_class_hash = match paymaster_account | ||
| .declare_v3(flattened_sierra_class.clone(), compiled_class_hash) | ||
| .send() | ||
| .await | ||
| { | ||
| Ok(result) => { | ||
| wait_for_sent_transaction(result.transaction_hash, &paymaster_account).await?; | ||
| Ok(result.class_hash) | ||
| } | ||
| Err(AccountError::Signing(sign_error)) => { | ||
| if sign_error.to_string().contains("is already declared") { | ||
| Ok(parse_class_hash_from_error(&sign_error.to_string())?) | ||
| } else { | ||
| Err(OpenRpcTestGenError::RunnerError( | ||
| RunnerError::AccountFailure(format!( | ||
| "Transaction execution error: {}", | ||
| sign_error | ||
| )), | ||
| )) | ||
| } | ||
| } | ||
|
|
||
| Err(AccountError::Provider(ProviderError::Other(starkneterror))) => { | ||
| if starkneterror.to_string().contains("is already declared") { | ||
| Ok(parse_class_hash_from_error(&starkneterror.to_string())?) | ||
| } else { | ||
| Err(OpenRpcTestGenError::RunnerError( | ||
| RunnerError::AccountFailure(format!( | ||
| "Transaction execution error: {}", | ||
| starkneterror | ||
| )), | ||
| )) | ||
| } | ||
| } | ||
| Err(e) => { | ||
| let full_error_message = format!("{:?}", e); | ||
|
|
||
| if full_error_message.contains("is already declared") { | ||
| Ok(extract_class_hash_from_error(&full_error_message)?) | ||
| } else { | ||
| let full_error_message = format!("{:?}", e); | ||
|
|
||
| return Err(OpenRpcTestGenError::AccountError(AccountError::Other( | ||
| full_error_message, | ||
| ))); | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| let account_data = create_account( | ||
| &provider, | ||
| AccountType::Oz, | ||
| Option::None, | ||
| Some(custom_account_class_hash?), | ||
| ) | ||
| .await?; | ||
|
|
||
| let transfer_amount = Felt::from_hex("0xfffffffffffffff")?; | ||
|
|
||
| let transfer_execution = paymaster_account | ||
| .execute_v3(vec![Call { | ||
| to: STRK, | ||
| selector: get_selector_from_name("transfer")?, | ||
| calldata: vec![account_data.address, transfer_amount, Felt::ZERO], | ||
| }]) | ||
| .send() | ||
| .await?; | ||
|
|
||
| wait_for_sent_transaction(transfer_execution.transaction_hash, &paymaster_account).await?; | ||
|
|
||
| let wait_config = WaitForTx { | ||
| wait: true, | ||
| wait_params: ValidatedWaitParams::default(), | ||
| }; | ||
|
|
||
| let deployment_hash = deploy_account( | ||
| &provider, | ||
| chain_id, | ||
| wait_config, | ||
| account_data, | ||
| DeployAccountVersion::V3, | ||
| ) | ||
| .await?; | ||
|
|
||
| wait_for_sent_transaction(deployment_hash, &paymaster_account).await?; | ||
|
|
||
| let account = SingleOwnerAccount::new( | ||
| provider.clone(), | ||
| LocalWallet::from(account_data.signing_key), | ||
| account_data.address, | ||
| chain_id, | ||
| ExecutionEncoding::New, | ||
| ); | ||
| Ok(Self { account }) | ||
| } |
There was a problem hiding this comment.
🧹 Nitpick (assertive)
Refactor error handling to reduce duplication.
The error handling logic in new_with_custom_account contains duplicated patterns. Consider extracting the common error handling logic into a separate function.
+ fn handle_declaration_error(error: AccountError) -> Result<Felt, OpenRpcTestGenError> {
+ match error {
+ AccountError::Signing(sign_error) => {
+ if sign_error.to_string().contains("is already declared") {
+ Ok(parse_class_hash_from_error(&sign_error.to_string())?)
+ } else {
+ Err(OpenRpcTestGenError::RunnerError(
+ RunnerError::AccountFailure(format!(
+ "Transaction execution error: {}",
+ sign_error
+ )),
+ ))
+ }
+ }
+ AccountError::Provider(ProviderError::Other(starkneterror)) => {
+ if starkneterror.to_string().contains("is already declared") {
+ Ok(parse_class_hash_from_error(&starkneterror.to_string())?)
+ } else {
+ Err(OpenRpcTestGenError::RunnerError(
+ RunnerError::AccountFailure(format!(
+ "Transaction execution error: {}",
+ starkneterror
+ )),
+ ))
+ }
+ }
+ e => {
+ let full_error_message = format!("{:?}", e);
+ if full_error_message.contains("is already declared") {
+ Ok(extract_class_hash_from_error(&full_error_message)?)
+ } else {
+ Err(OpenRpcTestGenError::AccountError(AccountError::Other(
+ full_error_message,
+ )))
+ }
+ }
+ }
+ }
pub async fn new_with_custom_account(
node_url: Url,
paymaster_account_address: Felt,
paymaster_private_key: Felt,
sierra: String,
casm: String,
) -> Result<Self, OpenRpcTestGenError> {
// ... existing setup code ...
let custom_account_class_hash = match paymaster_account
.declare_v3(flattened_sierra_class.clone(), compiled_class_hash)
.send()
.await
{
Ok(result) => {
wait_for_sent_transaction(result.transaction_hash, &paymaster_account).await?;
Ok(result.class_hash)
}
- Err(AccountError::Signing(sign_error)) => {
- if sign_error.to_string().contains("is already declared") {
- Ok(parse_class_hash_from_error(&sign_error.to_string())?)
- } else {
- Err(OpenRpcTestGenError::RunnerError(
- RunnerError::AccountFailure(format!(
- "Transaction execution error: {}",
- sign_error
- )),
- ))
- }
- }
- Err(AccountError::Provider(ProviderError::Other(starkneterror))) => {
- if starkneterror.to_string().contains("is already declared") {
- Ok(parse_class_hash_from_error(&starkneterror.to_string())?)
- } else {
- Err(OpenRpcTestGenError::RunnerError(
- RunnerError::AccountFailure(format!(
- "Transaction execution error: {}",
- starkneterror
- )),
- ))
- }
- }
- Err(e) => {
- let full_error_message = format!("{:?}", e);
- if full_error_message.contains("is already declared") {
- Ok(extract_class_hash_from_error(&full_error_message)?)
- } else {
- Err(OpenRpcTestGenError::AccountError(AccountError::Other(
- full_error_message,
- )))
- }
- }
+ Err(e) => handle_declaration_error(e)
};
// ... rest of the implementation ...
}📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| pub async fn new_with_custom_account( | |
| node_url: Url, | |
| paymaster_account_address: Felt, | |
| paymaster_private_key: Felt, | |
| sierra: String, | |
| casm: String, | |
| ) -> Result<Self, OpenRpcTestGenError> { | |
| let provider = JsonRpcClient::new(HttpTransport::new(node_url.clone())); | |
| let chain_id = get_chain_id(&provider).await?; | |
| let paymaster_private_key = SigningKey::from_secret_scalar(paymaster_private_key); | |
| let mut paymaster_account = SingleOwnerAccount::new( | |
| provider.clone(), | |
| LocalWallet::from(paymaster_private_key), | |
| paymaster_account_address, | |
| chain_id, | |
| ExecutionEncoding::New, | |
| ); | |
| paymaster_account.set_block_id(BlockId::Tag(BlockTag::Pending)); | |
| let (flattened_sierra_class, compiled_class_hash) = | |
| get_compiled_contract_from_string(sierra, casm).await?; | |
| let custom_account_class_hash = match paymaster_account | |
| .declare_v3(flattened_sierra_class.clone(), compiled_class_hash) | |
| .send() | |
| .await | |
| { | |
| Ok(result) => { | |
| wait_for_sent_transaction(result.transaction_hash, &paymaster_account).await?; | |
| Ok(result.class_hash) | |
| } | |
| Err(AccountError::Signing(sign_error)) => { | |
| if sign_error.to_string().contains("is already declared") { | |
| Ok(parse_class_hash_from_error(&sign_error.to_string())?) | |
| } else { | |
| Err(OpenRpcTestGenError::RunnerError( | |
| RunnerError::AccountFailure(format!( | |
| "Transaction execution error: {}", | |
| sign_error | |
| )), | |
| )) | |
| } | |
| } | |
| Err(AccountError::Provider(ProviderError::Other(starkneterror))) => { | |
| if starkneterror.to_string().contains("is already declared") { | |
| Ok(parse_class_hash_from_error(&starkneterror.to_string())?) | |
| } else { | |
| Err(OpenRpcTestGenError::RunnerError( | |
| RunnerError::AccountFailure(format!( | |
| "Transaction execution error: {}", | |
| starkneterror | |
| )), | |
| )) | |
| } | |
| } | |
| Err(e) => { | |
| let full_error_message = format!("{:?}", e); | |
| if full_error_message.contains("is already declared") { | |
| Ok(extract_class_hash_from_error(&full_error_message)?) | |
| } else { | |
| let full_error_message = format!("{:?}", e); | |
| return Err(OpenRpcTestGenError::AccountError(AccountError::Other( | |
| full_error_message, | |
| ))); | |
| } | |
| } | |
| }; | |
| let account_data = create_account( | |
| &provider, | |
| AccountType::Oz, | |
| Option::None, | |
| Some(custom_account_class_hash?), | |
| ) | |
| .await?; | |
| let transfer_amount = Felt::from_hex("0xfffffffffffffff")?; | |
| let transfer_execution = paymaster_account | |
| .execute_v3(vec![Call { | |
| to: STRK, | |
| selector: get_selector_from_name("transfer")?, | |
| calldata: vec![account_data.address, transfer_amount, Felt::ZERO], | |
| }]) | |
| .send() | |
| .await?; | |
| wait_for_sent_transaction(transfer_execution.transaction_hash, &paymaster_account).await?; | |
| let wait_config = WaitForTx { | |
| wait: true, | |
| wait_params: ValidatedWaitParams::default(), | |
| }; | |
| let deployment_hash = deploy_account( | |
| &provider, | |
| chain_id, | |
| wait_config, | |
| account_data, | |
| DeployAccountVersion::V3, | |
| ) | |
| .await?; | |
| wait_for_sent_transaction(deployment_hash, &paymaster_account).await?; | |
| let account = SingleOwnerAccount::new( | |
| provider.clone(), | |
| LocalWallet::from(account_data.signing_key), | |
| account_data.address, | |
| chain_id, | |
| ExecutionEncoding::New, | |
| ); | |
| Ok(Self { account }) | |
| } | |
| fn handle_declaration_error(error: AccountError) -> Result<Felt, OpenRpcTestGenError> { | |
| match error { | |
| AccountError::Signing(sign_error) => { | |
| if sign_error.to_string().contains("is already declared") { | |
| Ok(parse_class_hash_from_error(&sign_error.to_string())?) | |
| } else { | |
| Err(OpenRpcTestGenError::RunnerError( | |
| RunnerError::AccountFailure(format!( | |
| "Transaction execution error: {}", | |
| sign_error | |
| )), | |
| )) | |
| } | |
| } | |
| AccountError::Provider(ProviderError::Other(starkneterror)) => { | |
| if starkneterror.to_string().contains("is already declared") { | |
| Ok(parse_class_hash_from_error(&starkneterror.to_string())?) | |
| } else { | |
| Err(OpenRpcTestGenError::RunnerError( | |
| RunnerError::AccountFailure(format!( | |
| "Transaction execution error: {}", | |
| starkneterror | |
| )), | |
| )) | |
| } | |
| } | |
| e => { | |
| let full_error_message = format!("{:?}", e); | |
| if full_error_message.contains("is already declared") { | |
| Ok(extract_class_hash_from_error(&full_error_message)?) | |
| } else { | |
| Err(OpenRpcTestGenError::AccountError(AccountError::Other( | |
| full_error_message, | |
| ))) | |
| } | |
| } | |
| } | |
| } | |
| pub async fn new_with_custom_account( | |
| node_url: Url, | |
| paymaster_account_address: Felt, | |
| paymaster_private_key: Felt, | |
| sierra: String, | |
| casm: String, | |
| ) -> Result<Self, OpenRpcTestGenError> { | |
| let provider = JsonRpcClient::new(HttpTransport::new(node_url.clone())); | |
| let chain_id = get_chain_id(&provider).await?; | |
| let paymaster_private_key = SigningKey::from_secret_scalar(paymaster_private_key); | |
| let mut paymaster_account = SingleOwnerAccount::new( | |
| provider.clone(), | |
| LocalWallet::from(paymaster_private_key), | |
| paymaster_account_address, | |
| chain_id, | |
| ExecutionEncoding::New, | |
| ); | |
| paymaster_account.set_block_id(BlockId::Tag(BlockTag::Pending)); | |
| let (flattened_sierra_class, compiled_class_hash) = | |
| get_compiled_contract_from_string(sierra, casm).await?; | |
| let custom_account_class_hash = match paymaster_account | |
| .declare_v3(flattened_sierra_class.clone(), compiled_class_hash) | |
| .send() | |
| .await | |
| { | |
| Ok(result) => { | |
| wait_for_sent_transaction(result.transaction_hash, &paymaster_account).await?; | |
| Ok(result.class_hash) | |
| } | |
| Err(e) => handle_declaration_error(e) | |
| }; | |
| let account_data = create_account( | |
| &provider, | |
| AccountType::Oz, | |
| Option::None, | |
| Some(custom_account_class_hash?), | |
| ) | |
| .await?; | |
| let transfer_amount = Felt::from_hex("0xfffffffffffffff")?; | |
| let transfer_execution = paymaster_account | |
| .execute_v3(vec![Call { | |
| to: STRK, | |
| selector: get_selector_from_name("transfer")?, | |
| calldata: vec![account_data.address, transfer_amount, Felt::ZERO], | |
| }]) | |
| .send() | |
| .await?; | |
| wait_for_sent_transaction(transfer_execution.transaction_hash, &paymaster_account).await?; | |
| let wait_config = WaitForTx { | |
| wait: true, | |
| wait_params: ValidatedWaitParams::default(), | |
| }; | |
| let deployment_hash = deploy_account( | |
| &provider, | |
| chain_id, | |
| wait_config, | |
| account_data, | |
| DeployAccountVersion::V3, | |
| ) | |
| .await?; | |
| wait_for_sent_transaction(deployment_hash, &paymaster_account).await?; | |
| let account = SingleOwnerAccount::new( | |
| provider.clone(), | |
| LocalWallet::from(account_data.signing_key), | |
| account_data.address, | |
| chain_id, | |
| ExecutionEncoding::New, | |
| ); | |
| Ok(Self { account }) | |
| } |
Comment on lines
+138
to
+185
| let custom_account_class_hash = match paymaster_account | ||
| .declare_v3(flattened_sierra_class.clone(), compiled_class_hash) | ||
| .send() | ||
| .await | ||
| { | ||
| Ok(result) => { | ||
| wait_for_sent_transaction(result.transaction_hash, &paymaster_account).await?; | ||
| Ok(result.class_hash) | ||
| } | ||
| Err(AccountError::Signing(sign_error)) => { | ||
| if sign_error.to_string().contains("is already declared") { | ||
| Ok(parse_class_hash_from_error(&sign_error.to_string())?) | ||
| } else { | ||
| Err(OpenRpcTestGenError::RunnerError( | ||
| RunnerError::AccountFailure(format!( | ||
| "Transaction execution error: {}", | ||
| sign_error | ||
| )), | ||
| )) | ||
| } | ||
| } | ||
|
|
||
| Err(AccountError::Provider(ProviderError::Other(starkneterror))) => { | ||
| if starkneterror.to_string().contains("is already declared") { | ||
| Ok(parse_class_hash_from_error(&starkneterror.to_string())?) | ||
| } else { | ||
| Err(OpenRpcTestGenError::RunnerError( | ||
| RunnerError::AccountFailure(format!( | ||
| "Transaction execution error: {}", | ||
| starkneterror | ||
| )), | ||
| )) | ||
| } | ||
| } | ||
| Err(e) => { | ||
| let full_error_message = format!("{:?}", e); | ||
|
|
||
| if full_error_message.contains("is already declared") { | ||
| Ok(extract_class_hash_from_error(&full_error_message)?) | ||
| } else { | ||
| let full_error_message = format!("{:?}", e); | ||
|
|
||
| return Err(OpenRpcTestGenError::AccountError(AccountError::Other( | ||
| full_error_message, | ||
| ))); | ||
| } | ||
| } | ||
| }; |
There was a problem hiding this comment.
🧹 Nitpick (assertive)
Simplify error handling logic.
The error handling for contract declaration could be simplified to reduce code duplication. Consider extracting the common error handling pattern into a helper function.
+ fn handle_declaration_error(error: &impl std::fmt::Display) -> Result<Felt, OpenRpcTestGenError> {
+ let error_message = error.to_string();
+ if error_message.contains("is already declared") {
+ parse_class_hash_from_error(&error_message)
+ } else {
+ Err(OpenRpcTestGenError::RunnerError(
+ RunnerError::AccountFailure(format!(
+ "Transaction execution error: {}",
+ error_message
+ )),
+ ))
+ }
+ }
+
let custom_account_class_hash = match paymaster_account
.declare_v3(flattened_sierra_class.clone(), compiled_class_hash)
.send()
.await
{
Ok(result) => {
wait_for_sent_transaction(result.transaction_hash, &paymaster_account).await?;
Ok(result.class_hash)
}
- Err(AccountError::Signing(sign_error)) => {
- if sign_error.to_string().contains("is already declared") {
- Ok(parse_class_hash_from_error(&sign_error.to_string())?)
- } else {
- Err(OpenRpcTestGenError::RunnerError(
- RunnerError::AccountFailure(format!(
- "Transaction execution error: {}",
- sign_error
- )),
- ))
- }
- }
- Err(AccountError::Provider(ProviderError::Other(starkneterror))) => {
- if starkneterror.to_string().contains("is already declared") {
- Ok(parse_class_hash_from_error(&starkneterror.to_string())?)
- } else {
- Err(OpenRpcTestGenError::RunnerError(
- RunnerError::AccountFailure(format!(
- "Transaction execution error: {}",
- starkneterror
- )),
- ))
- }
- }
- Err(e) => {
- let full_error_message = format!("{:?}", e);
- if full_error_message.contains("is already declared") {
- Ok(extract_class_hash_from_error(&full_error_message)?)
- } else {
- let full_error_message = format!("{:?}", e);
- return Err(OpenRpcTestGenError::AccountError(AccountError::Other(
- full_error_message,
- )));
- }
- }
+ Err(AccountError::Signing(sign_error)) => handle_declaration_error(&sign_error),
+ Err(AccountError::Provider(ProviderError::Other(starkneterror))) => {
+ handle_declaration_error(&starkneterror)
+ }
+ Err(e) => {
+ let full_error_message = format!("{:?}", e);
+ if full_error_message.contains("is already declared") {
+ Ok(extract_class_hash_from_error(&full_error_message)?)
+ } else {
+ Err(OpenRpcTestGenError::AccountError(AccountError::Other(
+ full_error_message,
+ )))
+ }
+ }
};📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| let custom_account_class_hash = match paymaster_account | |
| .declare_v3(flattened_sierra_class.clone(), compiled_class_hash) | |
| .send() | |
| .await | |
| { | |
| Ok(result) => { | |
| wait_for_sent_transaction(result.transaction_hash, &paymaster_account).await?; | |
| Ok(result.class_hash) | |
| } | |
| Err(AccountError::Signing(sign_error)) => { | |
| if sign_error.to_string().contains("is already declared") { | |
| Ok(parse_class_hash_from_error(&sign_error.to_string())?) | |
| } else { | |
| Err(OpenRpcTestGenError::RunnerError( | |
| RunnerError::AccountFailure(format!( | |
| "Transaction execution error: {}", | |
| sign_error | |
| )), | |
| )) | |
| } | |
| } | |
| Err(AccountError::Provider(ProviderError::Other(starkneterror))) => { | |
| if starkneterror.to_string().contains("is already declared") { | |
| Ok(parse_class_hash_from_error(&starkneterror.to_string())?) | |
| } else { | |
| Err(OpenRpcTestGenError::RunnerError( | |
| RunnerError::AccountFailure(format!( | |
| "Transaction execution error: {}", | |
| starkneterror | |
| )), | |
| )) | |
| } | |
| } | |
| Err(e) => { | |
| let full_error_message = format!("{:?}", e); | |
| if full_error_message.contains("is already declared") { | |
| Ok(extract_class_hash_from_error(&full_error_message)?) | |
| } else { | |
| let full_error_message = format!("{:?}", e); | |
| return Err(OpenRpcTestGenError::AccountError(AccountError::Other( | |
| full_error_message, | |
| ))); | |
| } | |
| } | |
| }; | |
| fn handle_declaration_error(error: &impl std::fmt::Display) -> Result<Felt, OpenRpcTestGenError> { | |
| let error_message = error.to_string(); | |
| if error_message.contains("is already declared") { | |
| parse_class_hash_from_error(&error_message) | |
| } else { | |
| Err(OpenRpcTestGenError::RunnerError( | |
| RunnerError::AccountFailure(format!( | |
| "Transaction execution error: {}", | |
| error_message | |
| )), | |
| )) | |
| } | |
| } | |
| let custom_account_class_hash = match paymaster_account | |
| .declare_v3(flattened_sierra_class.clone(), compiled_class_hash) | |
| .send() | |
| .await | |
| { | |
| Ok(result) => { | |
| wait_for_sent_transaction(result.transaction_hash, &paymaster_account).await?; | |
| Ok(result.class_hash) | |
| } | |
| Err(AccountError::Signing(sign_error)) => handle_declaration_error(&sign_error), | |
| Err(AccountError::Provider(ProviderError::Other(starkneterror))) => { | |
| handle_declaration_error(&starkneterror) | |
| } | |
| Err(e) => { | |
| let full_error_message = format!("{:?}", e); | |
| if full_error_message.contains("is already declared") { | |
| Ok(extract_class_hash_from_error(&full_error_message)?) | |
| } else { | |
| Err(OpenRpcTestGenError::AccountError(AccountError::Other( | |
| full_error_message, | |
| ))) | |
| } | |
| } | |
| }; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary by CodeRabbit
Release Notes
New Features
Improvements
Refactoring
StarkneHivetoStarknetHive