Update predeployed ERC20 metadata initialization (#928)

* update: predeployed ERC20 metadata initialization

Author: 3alpha

crates/starknet-devnet-core/contracts/system_artifacts/erc20_eth.sierra

@@ -27,7 +27,7 @@ pub const CAIRO_1_ACCOUNT_CONTRACT_SIERRA_HASH: &str =
     "0x05b4b537eaa2399e3aa99c4e2e0208ebd6c71bc1467938cd52c798c601e43564";
 
 pub const ETH_ERC20_CONTRACT_CLASS_HASH: Felt =
-    Felt::from_hex_unchecked("0x9524a94b41c4440a16fd96d7c1ef6ad6f44c1c013e96662734502cd4ee9b1f");
+    Felt::from_hex_unchecked("0x00b45dbc3714180381c5680e41931172d67194d77d504413465390e0bef194ec");
 pub const ETH_ERC20_CONTRACT_CLASS: &str = include_str!(concat!(
     env!("CARGO_MANIFEST_DIR"),
     "/contracts/system_artifacts/erc20_eth.sierra"
@@ -36,7 +36,7 @@ pub const ETH_ERC20_CONTRACT_ADDRESS: Felt =
     Felt::from_hex_unchecked("0x49D36570D4E46F48E99674BD3FCC84644DDD6B96F7C741B1562B82F9E004DC7");
 
 pub const STRK_ERC20_CONTRACT_CLASS_HASH: Felt =
-    Felt::from_hex_unchecked("0x76791ef97c042f81fbf352ad95f39a22554ee8d7927b2ce3c681f3418b5206a");
+    Felt::from_hex_unchecked("0x02e77ee61d4df3d988ee1f42ea5442e913862cc82c2584d212ecda76666498fc");
 pub const STRK_ERC20_CONTRACT_CLASS: &str = include_str!(concat!(
     env!("CARGO_MANIFEST_DIR"),
     "/contracts/system_artifacts/erc20_strk.sierra"

crates/starknet-devnet-core/contracts/system_artifacts/erc20_strk.sierra

@@ -1,8 +1,10 @@
 use blockifier::state::state_api::State;
 use starknet_rs_core::types::Felt;
-use starknet_rs_core::utils::cairo_short_string_to_felt;
+use starknet_rs_core::utils::{cairo_short_string_to_felt, normalize_address};
 use starknet_types::contract_address::ContractAddress;
 use starknet_types::felt::felt_from_prefixed_hex;
+use starknet_types::patricia_key::PatriciaKey;
+use starknet_types_core::hash::Poseidon;
 
 use crate::constants::{
     CHARGEABLE_ACCOUNT_ADDRESS, UDC_CONTRACT, UDC_CONTRACT_ADDRESS, UDC_CONTRACT_CLASS_HASH,
@@ -23,7 +25,6 @@ pub(crate) fn create_erc20_at_address_extended(
     Ok(erc20_fee_contract)
 }
 
-/// Set initial values of ERC20 contract storage
 pub(crate) fn initialize_erc20_at_address(
     state: &mut StarknetState,
     contract_address: Felt,
@@ -32,22 +33,38 @@ pub(crate) fn initialize_erc20_at_address(
 ) -> DevnetResult<()> {
     let contract_address = ContractAddress::new(contract_address)?;
 
+    for (storage_var_name, s) in [("ERC20_name", erc20_name), ("ERC20_symbol", erc20_symbol)] {
+        assert!(s.len() <= 30, "ByteArray short-string init only supports <= 30 bytes");
+
+        let base: Felt = get_storage_var_address(storage_var_name, &[])?.to_felt();
+        let pending_word = cairo_short_string_to_felt(s)
+            .map_err(|err| Error::UnexpectedInternalError { msg: err.to_string() })?;
+
+        state.set_storage_at(
+            contract_address.into(),
+            PatriciaKey::new(base)?.into(),
+            Felt::from(s.len() as u64),
+        )?;
+
+        let byte_array_marker = cairo_short_string_to_felt("ByteArray")
+            .map_err(|err| Error::UnexpectedInternalError { msg: err.to_string() })?;
+        let mut state_arr = [base, Felt::ZERO, byte_array_marker];
+        Poseidon::hades_permutation(&mut state_arr);
+        let chunk_base = normalize_address(state_arr[0]);
+
+        state.set_storage_at(
+            contract_address.into(),
+            PatriciaKey::new(chunk_base)?.into(),
+            pending_word,
+        )?;
+    }
+
     for (storage_var_name, storage_value) in [
-        (
-            "ERC20_name",
-            cairo_short_string_to_felt(erc20_name)
-                .map_err(|err| Error::UnexpectedInternalError { msg: err.to_string() })?,
-        ),
-        (
-            "ERC20_symbol",
-            cairo_short_string_to_felt(erc20_symbol)
-                .map_err(|err| Error::UnexpectedInternalError { msg: err.to_string() })?,
-        ),
-        ("ERC20_decimals", 18.into()),
+        ("ERC20_decimals", 18u64.into()),
         ("permitted_minter", felt_from_prefixed_hex(CHARGEABLE_ACCOUNT_ADDRESS)?),
     ] {
-        let storage_var_address = get_storage_var_address(storage_var_name, &[])?.into();
-        state.set_storage_at(contract_address.into(), storage_var_address, storage_value)?;
+        let key = get_storage_var_address(storage_var_name, &[])?;
+        state.set_storage_at(contract_address.into(), key.into(), storage_value)?;
     }
 
     Ok(())

crates/starknet-devnet-core/src/constants.rs

@@ -44,9 +44,9 @@ pub const CAIRO_1_ACCOUNT_CONTRACT_0_8_0_SIERRA_PATH: &str = concat!(
 pub const ETH_ERC20_CONTRACT_ADDRESS: Felt =
     Felt::from_hex_unchecked("0x49D36570D4E46F48E99674BD3FCC84644DDD6B96F7C741B1562B82F9E004DC7");
 pub const ETH_ERC20_CONTRACT_CLASS_HASH: Felt =
-    Felt::from_hex_unchecked("0x9524a94b41c4440a16fd96d7c1ef6ad6f44c1c013e96662734502cd4ee9b1f");
+    Felt::from_hex_unchecked("0x00b45dbc3714180381c5680e41931172d67194d77d504413465390e0bef194ec");
 pub const STRK_ERC20_CONTRACT_CLASS_HASH: Felt =
-    Felt::from_hex_unchecked("0x76791ef97c042f81fbf352ad95f39a22554ee8d7927b2ce3c681f3418b5206a");
+    Felt::from_hex_unchecked("0x02e77ee61d4df3d988ee1f42ea5442e913862cc82c2584d212ecda76666498fc");
 pub const STRK_ERC20_CONTRACT_ADDRESS: Felt =
     Felt::from_hex_unchecked("0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d");
 pub const UDC_LEGACY_CONTRACT_ADDRESS: Felt =

crates/starknet-devnet-core/src/starknet/predeployed.rs

@@ -140,7 +140,7 @@ async fn predeployed_erc20_tokens_have_expected_storage() {
             .unwrap()
             .value();
 
-        assert_eq!(parse_cairo_short_string(&actual_value).unwrap().as_str(), expected_value);
+        assert_eq!(actual_value, expected_value.len().into());
     }
 }
 
@@ -165,8 +165,7 @@ async fn predeployed_erc20_tokens_return_expected_values_from_property_getters()
             )
             .await
             .unwrap();
-
-        assert_eq!(actual_felts.len(), 1);
-        assert_eq!(parse_cairo_short_string(&actual_felts[0]).unwrap(), expected_value);
+        assert_eq!(actual_felts.len(), 3);
+        assert_eq!(parse_cairo_short_string(&actual_felts[1]).unwrap(), expected_value);
     }
 }

tests/integration/common/constants.rs

@@ -123,8 +123,14 @@ async fn deploy_transaction_receipt() {
                 .iter()
                 .find(|e| e.from_address == STRK_ERC20_CONTRACT_ADDRESS)
                 .unwrap();
-            assert_eq!(fee_charge_event.keys, vec![get_selector_from_name("Transfer").unwrap()]);
-            assert_eq!(fee_charge_event.data[0], account_address);
+            assert_eq!(
+                fee_charge_event.keys,
+                vec![
+                    get_selector_from_name("Transfer").unwrap(),
+                    account_address,
+                    Felt::from_hex_unchecked("0x1000") // this is sequencer address
+                ]
+            );
         }
         _ => panic!("Invalid receipt {:?}", deployment_receipt),
     };