dev: bump kakarot (#685)

* bump kakarot * bump kakarot
kkrt-labs · Jan 4, 2024 · c287b62 · c287b62
1 parent 13c5f12
commit c287b62
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
@@ -21,17 +21,17 @@ lint:
     - [email protected]
     - git-diff-check
     - [email protected]
-    - markdownlint@0.37.0
-    - osv-scanner@1.4.3
+    - markdownlint@0.38.0
+    - osv-scanner@1.5.0
     - [email protected]
-    - [email protected].0
+    - [email protected].1
     - [email protected]
     - [email protected]
     - [email protected]
     - [email protected]
-    - [email protected].5
-    - trivy@0.47.0
-    - [email protected].2-rc0
+    - [email protected].11
+    - trivy@0.48.1
+    - [email protected].7
     - [email protected]
 actions:
   disabled:

diff --git a/lib/kakarot b/lib/kakarot
diff --git 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
@@ -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)
+16 −3		.github/workflows/ci.yml
+5,709 −0		blockchain-tests-skip.yml
+16 −1		poetry.lock
+1 −0		pyproject.toml
+1 −2		scripts/artifacts.py
+12 −12		scripts/check_resources.py
+0 −1		scripts/constants.py
+0 −14		scripts/deploy_kakarot.py
+0 −76		scripts/get_latest_blockhashes.py
+9 −0		solidity_contracts/tests/PlainOpcodes.t.sol
+37 −7		src/backend/starknet.cairo
+2 −30		src/kakarot/account.cairo
+2 −2		src/kakarot/constants.cairo
+47 −88		src/kakarot/errors.cairo
+149 −862		src/kakarot/evm.cairo
+0 −363		src/kakarot/execution_context.cairo
+104 −0		src/kakarot/gas.cairo
+92 −113		src/kakarot/instructions/block_information.cairo
+11 −16		src/kakarot/instructions/duplication_operations.cairo
+165 −197		src/kakarot/instructions/environmental_information.cairo
+11 −12		src/kakarot/instructions/exchange_operations.cairo
+25 −27		src/kakarot/instructions/logging_operations.cairo
+122 −213		src/kakarot/instructions/memory_operations.cairo
+17 −22		src/kakarot/instructions/push_operations.cairo
+21 −39		src/kakarot/instructions/sha3.cairo
+51 −45		src/kakarot/instructions/stop_and_math_operations.cairo
+380 −399		src/kakarot/instructions/system_operations.cairo
+0 −17		src/kakarot/interfaces/interfaces.cairo
+851 −0		src/kakarot/interpreter.cairo
+7 −35		src/kakarot/kakarot.cairo
+9 −45		src/kakarot/library.cairo
+51 −97		src/kakarot/memory.cairo
+45 −28		src/kakarot/model.cairo
+1 −1		src/kakarot/precompiles/datacopy.cairo
+15 −18		src/kakarot/precompiles/precompiles.cairo
+1 −1		src/kakarot/precompiles/ripemd160.cairo
+0 −51		src/kakarot/registry/blockhash/blockhash_registry.cairo
+0 −76		src/kakarot/registry/blockhash/library.cairo
+51 −63		src/kakarot/stack.cairo
+85 −120		src/kakarot/state.cairo
+0 −4		src/kakarot/storages.cairo
+6 −2		src/utils/dict.cairo
+1 −3		src/utils/rlp.cairo
+0 −3		src/utils/utils.cairo
+0 −1		tests/conftest.py
+1 −1		tests/end_to_end/bytecodes.py
+1 −3		tests/end_to_end/test_kakarot.py
+42 −45		tests/fixtures/EVM.cairo
+0 −38		tests/fixtures/blockhash_registry.py
+3 −5		tests/fixtures/starknet.py
+0 −4		tests/integration/conftest.py
+13 −47		tests/src/kakarot/instructions/test_block_information.cairo
+14 −48		tests/src/kakarot/instructions/test_block_information.py
+12 −8		tests/src/kakarot/instructions/test_duplication_operations.cairo
+146 −260		tests/src/kakarot/instructions/test_environmental_information.cairo
+106 −93		tests/src/kakarot/instructions/test_environmental_information.py
+13 −14		tests/src/kakarot/instructions/test_exchange_operations.cairo
+68 −86		tests/src/kakarot/instructions/test_memory_operations.cairo
+0 −1		tests/src/kakarot/instructions/test_memory_operations.py
+10 −5		tests/src/kakarot/instructions/test_push_operations.cairo
+21 −17		tests/src/kakarot/instructions/test_stop_and_math_operations.cairo
+0 −782		tests/src/kakarot/instructions/test_system_operations.cairo
+0 −176		tests/src/kakarot/instructions/test_system_operations.py
+1 −1		tests/src/kakarot/precompiles/test_ec_add.cairo
+1 −1		tests/src/kakarot/precompiles/test_ec_mul.cairo
+1 −1		tests/src/kakarot/precompiles/test_modexp.cairo
+16 −8		tests/src/kakarot/precompiles/test_precompiles.cairo
+1 −1		tests/src/kakarot/precompiles/test_ripemd160.cairo
+0 −24		tests/src/kakarot/registry/test_blockhash_registry.py
+0 −54		tests/src/kakarot/test_account.cairo
+0 −21		tests/src/kakarot/test_account.py
+13 −11		tests/src/kakarot/test_evm.cairo
+8 −108		tests/src/kakarot/test_execution_context.cairo
+17 −13		tests/src/kakarot/test_execution_context.py
+15 −0		tests/src/kakarot/test_gas.cairo
+27 −0		tests/src/kakarot/test_gas.py
+19 −22		tests/src/kakarot/test_memory.cairo
+0 −9		tests/src/kakarot/test_memory.py
+58 −47		tests/src/kakarot/test_stack.cairo
+31 −29		tests/src/kakarot/test_state.cairo
+1 −1		tests/src/utils/test_array.py
+1 −1		tests/src/utils/test_bytes.py
+1 −1		tests/src/utils/test_dict.py
+1 −1		tests/src/utils/test_rlp.py
+1 −1		tests/src/utils/test_uint256.py
+1 −1		tests/src/utils/test_utils.py
+5 −1		tests/utils/constants.py
+54 −91		tests/utils/helpers.cairo
+11 −12		tests/utils/helpers.py