From 31e935ab72ef464839556c8452d5dc75f9c7e295 Mon Sep 17 00:00:00 2001 From: FabijanC Date: Fri, 6 Dec 2024 12:17:52 +0100 Subject: [PATCH] Expand predeclared account class assertion test --- crates/starknet-devnet-core/src/starknet/mod.rs | 15 +++++++++++---- website/docs/predeployed.md | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/crates/starknet-devnet-core/src/starknet/mod.rs b/crates/starknet-devnet-core/src/starknet/mod.rs index e5a8ee995..edebfac46 100644 --- a/crates/starknet-devnet-core/src/starknet/mod.rs +++ b/crates/starknet-devnet-core/src/starknet/mod.rs @@ -1429,9 +1429,11 @@ mod tests { use crate::account::{Account, FeeToken}; use crate::blocks::StarknetBlock; use crate::constants::{ - ARGENT_CONTRACT_CLASS_HASH, ARGENT_MULTISIG_CONTRACT_CLASS_HASH, DEVNET_DEFAULT_CHAIN_ID, - DEVNET_DEFAULT_INITIAL_BALANCE, DEVNET_DEFAULT_STARTING_BLOCK_NUMBER, - ETH_ERC20_CONTRACT_ADDRESS, STRK_ERC20_CONTRACT_ADDRESS, + ARGENT_CONTRACT_CLASS_HASH, ARGENT_MULTISIG_CONTRACT_CLASS_HASH, + CAIRO_0_ACCOUNT_CONTRACT_HASH, CAIRO_1_ACCOUNT_CONTRACT_SIERRA_HASH, + DEVNET_DEFAULT_CHAIN_ID, DEVNET_DEFAULT_INITIAL_BALANCE, + DEVNET_DEFAULT_STARTING_BLOCK_NUMBER, ETH_ERC20_CONTRACT_ADDRESS, + STRK_ERC20_CONTRACT_ADDRESS, }; use crate::error::{DevnetResult, Error}; use crate::stack_trace::{ErrorStack, Frame}; @@ -1699,7 +1701,12 @@ mod tests { fn assert_expected_predeclared_account_classes() { let config = StarknetConfig { predeclare_argent: true, ..Default::default() }; let starknet = Starknet::new(&config).unwrap(); - for class_hash in [ARGENT_CONTRACT_CLASS_HASH, ARGENT_MULTISIG_CONTRACT_CLASS_HASH] { + for class_hash in [ + ARGENT_CONTRACT_CLASS_HASH, + ARGENT_MULTISIG_CONTRACT_CLASS_HASH, + Felt::from_hex_unchecked(CAIRO_0_ACCOUNT_CONTRACT_HASH), + Felt::from_hex_unchecked(CAIRO_1_ACCOUNT_CONTRACT_SIERRA_HASH), + ] { let contract = starknet.get_class(&BlockId::Tag(BlockTag::Latest), class_hash).unwrap(); assert_eq!(contract.generate_hash().unwrap(), class_hash); } diff --git a/website/docs/predeployed.md b/website/docs/predeployed.md index c0920f878..52f85c8d0 100644 --- a/website/docs/predeployed.md +++ b/website/docs/predeployed.md @@ -31,7 +31,7 @@ Alternatively, provide a path to the [Sierra artifact](https://github.com/starkw ## Predeclared account classes -Both Cairo 0 and Cairo 1 versions of OpenZeppelin account are always predeclared, regardless of the chosen predeployment variant. If you specify the `--predeclare-argent` flag on startup, the latest regular and multistig variants of Argent accounts will also be predeclared. +Both Cairo 0 and Cairo 1 versions of OpenZeppelin account are always predeclared, regardless of the chosen predeployment variant. If you specify the `--predeclare-argent` flag on startup, the latest regular and multistig variants of Argent account will also be predeclared. ## Deploying an undeclared account