backport to older forks

gurukamath · gurukamath · commit 9ec8101c6859 · 2025-04-23T08:59:24.000+02:00
diff --git a/src/ethereum/arrow_glacier/fork.py b/src/ethereum/arrow_glacier/fork.py
@@ -793,9 +793,12 @@ def process_transaction(
         tx, tx_output.error, block_output.block_gas_used, tx_output.logs
     )
 
+    receipt_key = rlp.encode(Uint(index))
+    block_output.receipt_keys += (receipt_key,)
+
     trie_set(
         block_output.receipts_trie,
-        rlp.encode(Uint(index)),
+        receipt_key,
         receipt,
     )
 
diff --git a/src/ethereum/arrow_glacier/vm/__init__.py b/src/ethereum/arrow_glacier/vm/__init__.py
@@ -62,6 +62,8 @@ class BlockOutput:
         Trie of all the transactions in the block.
     receipts_trie : `ethereum.fork_types.Root`
         Trie root of all the receipts in the block.
+    receipt_keys :
+        Key of all the receipts in the block.
     block_logs : `Bloom`
         Logs bloom of all the logs included in all the transactions of the
         block.
@@ -74,6 +76,7 @@ class BlockOutput:
     receipts_trie: Trie[Bytes, Optional[Union[Bytes, Receipt]]] = field(
         default_factory=lambda: Trie(secured=False, default=None)
     )
+    receipt_keys: Tuple[Bytes, ...] = field(default_factory=tuple)
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
diff --git a/src/ethereum/berlin/fork.py b/src/ethereum/berlin/fork.py
@@ -692,9 +692,12 @@ def process_transaction(
         tx, tx_output.error, block_output.block_gas_used, tx_output.logs
     )
 
+    receipt_key = rlp.encode(Uint(index))
+    block_output.receipt_keys += (receipt_key,)
+
     trie_set(
         block_output.receipts_trie,
-        rlp.encode(Uint(index)),
+        receipt_key,
         receipt,
     )
 
diff --git a/src/ethereum/berlin/vm/__init__.py b/src/ethereum/berlin/vm/__init__.py
@@ -61,6 +61,8 @@ class BlockOutput:
         Trie of all the transactions in the block.
     receipts_trie : `ethereum.fork_types.Root`
         Trie root of all the receipts in the block.
+    receipt_keys :
+        Key of all the receipts in the block.
     block_logs : `Bloom`
         Logs bloom of all the logs included in all the transactions of the
         block.
@@ -73,6 +75,7 @@ class BlockOutput:
     receipts_trie: Trie[Bytes, Optional[Union[Bytes, Receipt]]] = field(
         default_factory=lambda: Trie(secured=False, default=None)
     )
+    receipt_keys: Tuple[Bytes, ...] = field(default_factory=tuple)
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
diff --git a/src/ethereum/byzantium/fork.py b/src/ethereum/byzantium/fork.py
@@ -669,9 +669,12 @@ def process_transaction(
         tx_output.error, block_output.block_gas_used, tx_output.logs
     )
 
+    receipt_key = rlp.encode(Uint(index))
+    block_output.receipt_keys += (receipt_key,)
+
     trie_set(
         block_output.receipts_trie,
-        rlp.encode(Uint(index)),
+        receipt_key,
         receipt,
     )
 
diff --git a/src/ethereum/byzantium/vm/__init__.py b/src/ethereum/byzantium/vm/__init__.py
@@ -61,6 +61,8 @@ class BlockOutput:
         Trie of all the transactions in the block.
     receipts_trie : `ethereum.fork_types.Root`
         Trie root of all the receipts in the block.
+    receipt_keys :
+        Key of all the receipts in the block.
     block_logs : `Bloom`
         Logs bloom of all the logs included in all the transactions of the
         block.
@@ -73,6 +75,7 @@ class BlockOutput:
     receipts_trie: Trie[Bytes, Optional[Receipt]] = field(
         default_factory=lambda: Trie(secured=False, default=None)
     )
+    receipt_keys: Tuple[Bytes, ...] = field(default_factory=tuple)
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
diff --git a/src/ethereum/cancun/fork.py b/src/ethereum/cancun/fork.py
@@ -731,9 +731,12 @@ def process_transaction(
         tx, tx_output.error, block_output.block_gas_used, tx_output.logs
     )
 
+    receipt_key = rlp.encode(Uint(index))
+    block_output.receipt_keys += (receipt_key,)
+
     trie_set(
         block_output.receipts_trie,
-        rlp.encode(Uint(index)),
+        receipt_key,
         receipt,
     )
 
diff --git a/src/ethereum/cancun/vm/__init__.py b/src/ethereum/cancun/vm/__init__.py
@@ -64,6 +64,8 @@ class BlockOutput:
         Trie of all the transactions in the block.
     receipts_trie : `ethereum.fork_types.Root`
         Trie root of all the receipts in the block.
+    receipt_keys :
+        Key of all the receipts in the block.
     block_logs : `Bloom`
         Logs bloom of all the logs included in all the transactions of the
         block.
@@ -80,6 +82,7 @@ class BlockOutput:
     receipts_trie: Trie[Bytes, Optional[Union[Bytes, Receipt]]] = field(
         default_factory=lambda: Trie(secured=False, default=None)
     )
+    receipt_keys: Tuple[Bytes, ...] = field(default_factory=tuple)
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
     withdrawals_trie: Trie[Bytes, Optional[Union[Bytes, Withdrawal]]] = field(
         default_factory=lambda: Trie(secured=False, default=None)
diff --git a/src/ethereum/constantinople/fork.py b/src/ethereum/constantinople/fork.py
@@ -669,9 +669,12 @@ def process_transaction(
         tx_output.error, block_output.block_gas_used, tx_output.logs
     )
 
+    receipt_key = rlp.encode(Uint(index))
+    block_output.receipt_keys += (receipt_key,)
+
     trie_set(
         block_output.receipts_trie,
-        rlp.encode(Uint(index)),
+        receipt_key,
         receipt,
     )
 
diff --git a/src/ethereum/constantinople/vm/__init__.py b/src/ethereum/constantinople/vm/__init__.py
@@ -61,6 +61,8 @@ class BlockOutput:
         Trie of all the transactions in the block.
     receipts_trie : `ethereum.fork_types.Root`
         Trie root of all the receipts in the block.
+    receipt_keys :
+        Key of all the receipts in the block.
     block_logs : `Bloom`
         Logs bloom of all the logs included in all the transactions of the
         block.
@@ -73,6 +75,7 @@ class BlockOutput:
     receipts_trie: Trie[Bytes, Optional[Receipt]] = field(
         default_factory=lambda: Trie(secured=False, default=None)
     )
+    receipt_keys: Tuple[Bytes, ...] = field(default_factory=tuple)
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
diff --git a/src/ethereum/dao_fork/fork.py b/src/ethereum/dao_fork/fork.py
@@ -673,9 +673,12 @@ def process_transaction(
         tx_output.logs,
     )
 
+    receipt_key = rlp.encode(Uint(index))
+    block_output.receipt_keys += (receipt_key,)
+
     trie_set(
         block_output.receipts_trie,
-        rlp.encode(Uint(index)),
+        receipt_key,
         receipt,
     )
 
diff --git a/src/ethereum/dao_fork/vm/__init__.py b/src/ethereum/dao_fork/vm/__init__.py
@@ -60,6 +60,8 @@ class BlockOutput:
         Trie of all the transactions in the block.
     receipts_trie : `ethereum.fork_types.Root`
         Trie root of all the receipts in the block.
+    receipt_keys :
+        Key of all the receipts in the block.
     block_logs : `Bloom`
         Logs bloom of all the logs included in all the transactions of the
         block.
@@ -72,6 +74,7 @@ class BlockOutput:
     receipts_trie: Trie[Bytes, Optional[Receipt]] = field(
         default_factory=lambda: Trie(secured=False, default=None)
     )
+    receipt_keys: Tuple[Bytes, ...] = field(default_factory=tuple)
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
diff --git a/src/ethereum/frontier/fork.py b/src/ethereum/frontier/fork.py
@@ -656,9 +656,12 @@ def process_transaction(
         tx_output.logs,
     )
 
+    receipt_key = rlp.encode(Uint(index))
+    block_output.receipt_keys += (receipt_key,)
+
     trie_set(
         block_output.receipts_trie,
-        rlp.encode(Uint(index)),
+        receipt_key,
         receipt,
     )
 
diff --git a/src/ethereum/frontier/vm/__init__.py b/src/ethereum/frontier/vm/__init__.py
@@ -60,6 +60,8 @@ class BlockOutput:
         Trie of all the transactions in the block.
     receipts_trie : `ethereum.fork_types.Root`
         Trie root of all the receipts in the block.
+    receipt_keys :
+        Key of all the receipts in the block.
     block_logs : `Bloom`
         Logs bloom of all the logs included in all the transactions of the
         block.
@@ -72,6 +74,7 @@ class BlockOutput:
     receipts_trie: Trie[Bytes, Optional[Receipt]] = field(
         default_factory=lambda: Trie(secured=False, default=None)
     )
+    receipt_keys: Tuple[Bytes, ...] = field(default_factory=tuple)
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
diff --git a/src/ethereum/gray_glacier/fork.py b/src/ethereum/gray_glacier/fork.py
@@ -793,9 +793,12 @@ def process_transaction(
         tx, tx_output.error, block_output.block_gas_used, tx_output.logs
     )
 
+    receipt_key = rlp.encode(Uint(index))
+    block_output.receipt_keys += (receipt_key,)
+
     trie_set(
         block_output.receipts_trie,
-        rlp.encode(Uint(index)),
+        receipt_key,
         receipt,
     )
 
diff --git a/src/ethereum/gray_glacier/vm/__init__.py b/src/ethereum/gray_glacier/vm/__init__.py
@@ -62,6 +62,8 @@ class BlockOutput:
         Trie of all the transactions in the block.
     receipts_trie : `ethereum.fork_types.Root`
         Trie root of all the receipts in the block.
+    receipt_keys :
+        Key of all the receipts in the block.
     block_logs : `Bloom`
         Logs bloom of all the logs included in all the transactions of the
         block.
@@ -74,6 +76,7 @@ class BlockOutput:
     receipts_trie: Trie[Bytes, Optional[Union[Bytes, Receipt]]] = field(
         default_factory=lambda: Trie(secured=False, default=None)
     )
+    receipt_keys: Tuple[Bytes, ...] = field(default_factory=tuple)
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
diff --git a/src/ethereum/homestead/fork.py b/src/ethereum/homestead/fork.py
@@ -656,9 +656,12 @@ def process_transaction(
         tx_output.logs,
     )
 
+    receipt_key = rlp.encode(Uint(index))
+    block_output.receipt_keys += (receipt_key,)
+
     trie_set(
         block_output.receipts_trie,
-        rlp.encode(Uint(index)),
+        receipt_key,
         receipt,
     )
 
diff --git a/src/ethereum/homestead/vm/__init__.py b/src/ethereum/homestead/vm/__init__.py
@@ -60,6 +60,8 @@ class BlockOutput:
         Trie of all the transactions in the block.
     receipts_trie : `ethereum.fork_types.Root`
         Trie root of all the receipts in the block.
+    receipt_keys :
+        Key of all the receipts in the block.
     block_logs : `Bloom`
         Logs bloom of all the logs included in all the transactions of the
         block.
@@ -72,6 +74,7 @@ class BlockOutput:
     receipts_trie: Trie[Bytes, Optional[Receipt]] = field(
         default_factory=lambda: Trie(secured=False, default=None)
     )
+    receipt_keys: Tuple[Bytes, ...] = field(default_factory=tuple)
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
diff --git a/src/ethereum/istanbul/fork.py b/src/ethereum/istanbul/fork.py
@@ -669,9 +669,12 @@ def process_transaction(
         tx_output.error, block_output.block_gas_used, tx_output.logs
     )
 
+    receipt_key = rlp.encode(Uint(index))
+    block_output.receipt_keys += (receipt_key,)
+
     trie_set(
         block_output.receipts_trie,
-        rlp.encode(Uint(index)),
+        receipt_key,
         receipt,
     )
 
diff --git a/src/ethereum/istanbul/vm/__init__.py b/src/ethereum/istanbul/vm/__init__.py
@@ -61,6 +61,8 @@ class BlockOutput:
         Trie of all the transactions in the block.
     receipts_trie : `ethereum.fork_types.Root`
         Trie root of all the receipts in the block.
+    receipt_keys :
+        Key of all the receipts in the block.
     block_logs : `Bloom`
         Logs bloom of all the logs included in all the transactions of the
         block.
@@ -73,6 +75,7 @@ class BlockOutput:
     receipts_trie: Trie[Bytes, Optional[Receipt]] = field(
         default_factory=lambda: Trie(secured=False, default=None)
     )
+    receipt_keys: Tuple[Bytes, ...] = field(default_factory=tuple)
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
diff --git a/src/ethereum/london/fork.py b/src/ethereum/london/fork.py
@@ -799,9 +799,12 @@ def process_transaction(
         tx, tx_output.error, block_output.block_gas_used, tx_output.logs
     )
 
+    receipt_key = rlp.encode(Uint(index))
+    block_output.receipt_keys += (receipt_key,)
+
     trie_set(
         block_output.receipts_trie,
-        rlp.encode(Uint(index)),
+        receipt_key,
         receipt,
     )
 
diff --git a/src/ethereum/london/vm/__init__.py b/src/ethereum/london/vm/__init__.py
@@ -62,6 +62,8 @@ class BlockOutput:
         Trie of all the transactions in the block.
     receipts_trie : `ethereum.fork_types.Root`
         Trie root of all the receipts in the block.
+    receipt_keys :
+        Key of all the receipts in the block.
     block_logs : `Bloom`
         Logs bloom of all the logs included in all the transactions of the
         block.
@@ -74,6 +76,7 @@ class BlockOutput:
     receipts_trie: Trie[Bytes, Optional[Union[Bytes, Receipt]]] = field(
         default_factory=lambda: Trie(secured=False, default=None)
     )
+    receipt_keys: Tuple[Bytes, ...] = field(default_factory=tuple)
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
diff --git a/src/ethereum/muir_glacier/fork.py b/src/ethereum/muir_glacier/fork.py
@@ -671,9 +671,12 @@ def process_transaction(
         tx_output.error, block_output.block_gas_used, tx_output.logs
     )
 
+    receipt_key = rlp.encode(Uint(index))
+    block_output.receipt_keys += (receipt_key,)
+
     trie_set(
         block_output.receipts_trie,
-        rlp.encode(Uint(index)),
+        receipt_key,
         receipt,
     )
 
diff --git a/src/ethereum/muir_glacier/vm/__init__.py b/src/ethereum/muir_glacier/vm/__init__.py
@@ -61,6 +61,8 @@ class BlockOutput:
         Trie of all the transactions in the block.
     receipts_trie : `ethereum.fork_types.Root`
         Trie root of all the receipts in the block.
+    receipt_keys :
+        Key of all the receipts in the block.
     block_logs : `Bloom`
         Logs bloom of all the logs included in all the transactions of the
         block.
@@ -73,6 +75,7 @@ class BlockOutput:
     receipts_trie: Trie[Bytes, Optional[Receipt]] = field(
         default_factory=lambda: Trie(secured=False, default=None)
     )
+    receipt_keys: Tuple[Bytes, ...] = field(default_factory=tuple)
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
diff --git a/src/ethereum/paris/fork.py b/src/ethereum/paris/fork.py
@@ -572,9 +572,12 @@ def process_transaction(
         tx, tx_output.error, block_output.block_gas_used, tx_output.logs
     )
 
+    receipt_key = rlp.encode(Uint(index))
+    block_output.receipt_keys += (receipt_key,)
+
     trie_set(
         block_output.receipts_trie,
-        rlp.encode(Uint(index)),
+        receipt_key,
         receipt,
     )
 
diff --git a/src/ethereum/paris/vm/__init__.py b/src/ethereum/paris/vm/__init__.py
diff --git a/src/ethereum/shanghai/fork.py b/src/ethereum/shanghai/fork.py
diff --git a/src/ethereum/shanghai/vm/__init__.py b/src/ethereum/shanghai/vm/__init__.py
diff --git a/src/ethereum/spurious_dragon/fork.py b/src/ethereum/spurious_dragon/fork.py
diff --git a/src/ethereum/spurious_dragon/vm/__init__.py b/src/ethereum/spurious_dragon/vm/__init__.py
diff --git a/src/ethereum/tangerine_whistle/fork.py b/src/ethereum/tangerine_whistle/fork.py
diff --git a/src/ethereum/tangerine_whistle/vm/__init__.py b/src/ethereum/tangerine_whistle/vm/__init__.py

Original file line number	Diff line number	Diff line change
`@@ -793,9 +793,12 @@ def process_transaction(`
`793`	`793`	`tx, tx_output.error, block_output.block_gas_used, tx_output.logs`
`794`	`794`	`)`
`795`	`795`
	`796`	`+ receipt_key = rlp.encode(Uint(index))`
	`797`	`+ block_output.receipt_keys += (receipt_key,)`
	`798`	`+`
`796`	`799`	`trie_set(`
`797`	`800`	`block_output.receipts_trie,`
`798`		`- rlp.encode(Uint(index)),`
	`801`	`+ receipt_key,`
`799`	`802`	`receipt,`
`800`	`803`	`)`
`801`	`804`
Original file line number	Diff line number	Diff line change
`@@ -692,9 +692,12 @@ def process_transaction(`
`692`	`692`	`tx, tx_output.error, block_output.block_gas_used, tx_output.logs`
`693`	`693`	`)`
`694`	`694`
	`695`	`+ receipt_key = rlp.encode(Uint(index))`
	`696`	`+ block_output.receipt_keys += (receipt_key,)`
	`697`	`+`
`695`	`698`	`trie_set(`
`696`	`699`	`block_output.receipts_trie,`
`697`		`- rlp.encode(Uint(index)),`
	`700`	`+ receipt_key,`
`698`	`701`	`receipt,`
`699`	`702`	`)`
`700`	`703`
Original file line number	Diff line number	Diff line change
`@@ -669,9 +669,12 @@ def process_transaction(`
`669`	`669`	`tx_output.error, block_output.block_gas_used, tx_output.logs`
`670`	`670`	`)`
`671`	`671`
	`672`	`+ receipt_key = rlp.encode(Uint(index))`
	`673`	`+ block_output.receipt_keys += (receipt_key,)`
	`674`	`+`
`672`	`675`	`trie_set(`
`673`	`676`	`block_output.receipts_trie,`
`674`		`- rlp.encode(Uint(index)),`
	`677`	`+ receipt_key,`
`675`	`678`	`receipt,`
`676`	`679`	`)`
`677`	`680`
Original file line number	Diff line number	Diff line change
`@@ -731,9 +731,12 @@ def process_transaction(`
`731`	`731`	`tx, tx_output.error, block_output.block_gas_used, tx_output.logs`
`732`	`732`	`)`
`733`	`733`
	`734`	`+ receipt_key = rlp.encode(Uint(index))`
	`735`	`+ block_output.receipt_keys += (receipt_key,)`
	`736`	`+`
`734`	`737`	`trie_set(`
`735`	`738`	`block_output.receipts_trie,`
`736`		`- rlp.encode(Uint(index)),`
	`739`	`+ receipt_key,`
`737`	`740`	`receipt,`
`738`	`741`	`)`
`739`	`742`