From fbee89aecf66724e1a4fb78dd61b045859040142 Mon Sep 17 00:00:00 2001
From: Oba <obatirou@gmail.com>
Date: Thu, 7 Nov 2024 17:05:12 +0100
Subject: [PATCH 1/2] fix: set code_address of the deployment code to the
 created address

---
 .../instructions/system_operations.cairo      |  3 +--
 tests/end_to_end/test_kakarot.py              | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/cairo_zero/kakarot/instructions/system_operations.cairo b/cairo_zero/kakarot/instructions/system_operations.cairo
index 76fc70644..532775cd9 100644
--- a/cairo_zero/kakarot/instructions/system_operations.cairo
+++ b/cairo_zero/kakarot/instructions/system_operations.cairo
@@ -163,7 +163,6 @@ namespace SystemOperations {
         let (valid_jumpdests_start, valid_jumpdests) = Helpers.initialize_jumpdests(
             bytecode_len=size.low, bytecode=bytecode
         );
-        tempvar address_zero = new model.Address(starknet=0, evm=0);
         tempvar message = new model.Message(
             bytecode=bytecode,
             bytecode_len=size.low,
@@ -175,7 +174,7 @@ namespace SystemOperations {
             caller=evm.message.address.evm,
             parent=parent,
             address=target_account.address,
-            code_address=address_zero,
+            code_address=target_account.address,
             read_only=FALSE,
             is_create=TRUE,
             depth=evm.message.depth + 1,
diff --git a/tests/end_to_end/test_kakarot.py b/tests/end_to_end/test_kakarot.py
index 8ee484515..f96551aa1 100644
--- a/tests/end_to_end/test_kakarot.py
+++ b/tests/end_to_end/test_kakarot.py
@@ -130,6 +130,26 @@ async def test_execute(
                     if event.from_address != eth.address
                 ] == events
 
+        # https://github.com/code-423n4/2024-09-kakarot-findings/issues/44
+        async def test_execute_jump_creation_code(self, evm: Contract, origin):
+            params = {
+                "value": 0,
+                "code": "605f5f53605660015360025f5ff0",
+                "calldata": "",
+                "stack": "0000000000000000000000000000000000000000000000000000000000000000",
+                "memory": "",
+                "return_data": "",
+                "success": 1,
+            }
+            result = await evm.functions["evm_call"].call(
+                origin=origin,
+                value=int(params["value"]),
+                bytecode=hex_string_to_bytes_array(params["code"]),
+                calldata=hex_string_to_bytes_array(params["calldata"]),
+                access_list=[],
+            )
+            assert result.success == params["success"]
+
     class TestGetStarknetAddress:
         async def test_should_return_same_as_deployed_address(self, new_eoa):
             eoa = await new_eoa()

From 7679dcd3aef09e0b9e6b4b30492c9109686589cc Mon Sep 17 00:00:00 2001
From: Oba <obatirou@gmail.com>
Date: Thu, 7 Nov 2024 18:20:50 +0100
Subject: [PATCH 2/2] fix: same one for deploy tx

---
 cairo_zero/kakarot/interpreter.cairo |  4 +---
 tests/end_to_end/test_kakarot.py     | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/cairo_zero/kakarot/interpreter.cairo b/cairo_zero/kakarot/interpreter.cairo
index 4f090a319..252e28f95 100644
--- a/cairo_zero/kakarot/interpreter.cairo
+++ b/cairo_zero/kakarot/interpreter.cairo
@@ -859,7 +859,7 @@ namespace Interpreter {
         local bytecode: felt*;
         local calldata: felt*;
         local intrinsic_gas: felt;
-        local code_address: model.Address*;
+        let code_address = address;
         if (is_deploy_tx != FALSE) {
             let (empty: felt*) = alloc();
             let (init_code_words, _) = unsigned_div_rem(bytecode_len + 31, 32);
@@ -867,7 +867,6 @@ namespace Interpreter {
             assert bytecode = tmp_calldata;
             assert calldata = empty;
             assert intrinsic_gas = tmp_intrinsic_gas + Gas.CREATE + init_code_gas;
-            assert code_address = new model.Address(starknet=0, evm=0);
             let (valid_jumpdests_start, valid_jumpdests) = Helpers.initialize_jumpdests(
                 bytecode_len=bytecode_len, bytecode=bytecode
             );
@@ -878,7 +877,6 @@ namespace Interpreter {
             assert bytecode = tmp_bytecode;
             assert calldata = tmp_calldata;
             assert intrinsic_gas = tmp_intrinsic_gas;
-            assert code_address = address;
 
             let (new_dict) = default_dict_new(0);
             tempvar range_check_ptr = range_check_ptr;
diff --git a/tests/end_to_end/test_kakarot.py b/tests/end_to_end/test_kakarot.py
index f96551aa1..e7d03781a 100644
--- a/tests/end_to_end/test_kakarot.py
+++ b/tests/end_to_end/test_kakarot.py
@@ -247,6 +247,24 @@ async def test_eth_call_should_succeed(self, kakarot, new_eoa):
             assert result.return_data == []
             assert result.gas_used == 21_000
 
+    class TestEthCallJumpCreationCodeDeployTx:
+        async def test_eth_call_jump_creation_code_deploy_tx_should_succeed(
+            self, kakarot, new_eoa
+        ):
+            eoa = await new_eoa()
+            result = await kakarot.functions["eth_call"].call(
+                nonce=0,
+                origin=int(eoa.address, 16),
+                to={"is_some": 0, "value": 0},
+                gas_limit=TRANSACTION_GAS_LIMIT,
+                gas_price=1_000,
+                value=0,
+                data=bytes.fromhex("605f5f53605660015360025f5ff0"),
+                access_list=[],
+            )
+
+            assert result.success == 1
+
         async def test_eth_call_should_handle_uninitialized_class_update(
             self, kakarot, new_eoa, class_hashes
         ):