From c287b621cd1812bfc5a650ece62946b4b9c13693 Mon Sep 17 00:00:00 2001 From: greged93 <82421016+greged93@users.noreply.github.com> Date: Thu, 4 Jan 2024 12:43:28 +0100 Subject: [PATCH] dev: bump kakarot (#685) * bump kakarot * bump kakarot --- .trunk/trunk.yaml | 12 ++++++------ lib/kakarot | 2 +- src/hive_utils/hive_genesis.rs | 6 ------ tests/hive_utils.rs | 2 +- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index f75d7455e..7a856493d 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -21,17 +21,17 @@ lint: - clippy@1.65.0 - git-diff-check - hadolint@2.12.0 - - markdownlint@0.37.0 - - osv-scanner@1.4.3 + - markdownlint@0.38.0 + - osv-scanner@1.5.0 - oxipng@9.0.0 - - prettier@3.1.0 + - prettier@3.1.1 - rustfmt@1.65.0 - shellcheck@0.9.0 - shfmt@3.6.0 - taplo@0.8.1 - - terrascan@1.18.5 - - trivy@0.47.0 - - trufflehog@3.63.2-rc0 + - terrascan@1.18.11 + - trivy@0.48.1 + - trufflehog@3.63.7 - yamllint@1.33.0 actions: disabled: diff --git a/lib/kakarot b/lib/kakarot index f361ff5be..5822210c3 160000 --- a/lib/kakarot +++ b/lib/kakarot @@ -1 +1 @@ -Subproject commit f361ff5be5078d5f5f9a779a3ae8c562f29a2d49 +Subproject commit 5822210c365d03d599a20544c56ec686bc423c72 diff --git a/src/hive_utils/hive_genesis.rs b/src/hive_utils/hive_genesis.rs index 90e29d5ee..c939143c1 100644 --- a/src/hive_utils/hive_genesis.rs +++ b/src/hive_utils/hive_genesis.rs @@ -68,7 +68,6 @@ impl HiveGenesisConfig { // Define constant addresses for Kakarot contracts lazy_static! { pub static ref KAKAROT_ADDRESS: FieldElement = FieldElement::from_hex_be("0x9001").unwrap(); // Safe unwrap, 0x9001 - pub static ref BLOCKHASH_REGISTRY_ADDRESS: FieldElement = FieldElement::from_hex_be("0x9002").unwrap(); // Safe unwrap, 0x9002 pub static ref DEPLOYER_ACCOUNT_ADDRESS: FieldElement = FieldElement::from_hex_be("0x9003").unwrap(); // Safe unwrap, 0x9003 } @@ -156,10 +155,6 @@ pub async fn serialize_hive_to_madara_genesis_config( Felt(*KAKAROT_ADDRESS), Felt(*kakarot_contracts.get("kakarot").expect("Failed to get kakarot class hash")), )); - madara_loader.contracts.push(( - Felt(*BLOCKHASH_REGISTRY_ADDRESS), - Felt(*kakarot_contracts.get("blockhash_registry").expect("Failed to get blockhash_registry class hash")), - )); madara_loader.contracts.push(( Felt(*DEPLOYER_ACCOUNT_ADDRESS), Felt(*kakarot_contracts.get("OpenzeppelinAccount").expect("Failed to get deployer account class hash")), @@ -172,7 +167,6 @@ pub async fn serialize_hive_to_madara_genesis_config( ("contract_account_class_hash", contract_account_class_hash), ("externally_owned_account", eoa_class_hash), ("account_proxy_class_hash", account_proxy_class_hash), - ("blockhash_registry_address", *BLOCKHASH_REGISTRY_ADDRESS), // TODO: Use DEPLOY_FEE constant https://github.com/kkrt-labs/kakarot-rpc/pull/431/files#diff-88f745498d0aaf0b185085d99a74f0feaf253f047babc85770847931e7f726c3R125 ("deploy_fee", FieldElement::from(100000_u64)), ]; diff --git a/tests/hive_utils.rs b/tests/hive_utils.rs index 751019327..8641ecb19 100644 --- a/tests/hive_utils.rs +++ b/tests/hive_utils.rs @@ -397,7 +397,7 @@ async fn test_madara_genesis() { // Then let loader: GenesisLoader = serde_json::from_reader(&combined_genesis_file) .unwrap_or_else(|_| panic!("Failed to read from file at path {:?}", &combined_genesis_path)); - assert_eq!(9 + 3 + 7, loader.contracts.len()); // 9 original + 3 Kakarot contracts + 7 hive + assert_eq!(9 + 2 + 7, loader.contracts.len()); // 9 original + 2 Kakarot contracts + 7 hive // After std::fs::remove_file(combined_genesis_path)