Skip to content

Commit ca15b24

Browse files
committed
Revert "Merge branch 'eip-7934' into CLZ"
This reverts commit 2017994, reversing changes made to 2df3d67.
1 parent 2017994 commit ca15b24

File tree

3 files changed

+0
-13
lines changed

3 files changed

+0
-13
lines changed

execution_chain/constants.nim

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,4 @@ const
107107
HISTORY_STORAGE_ADDRESS* = address"0x0000F90827F1C53a10cb7A02335B175320002935"
108108
WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS* = address"0x00000961Ef480Eb55e80D19ad83579A64c007002"
109109
CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS* = address"0x0000BBdDc7CE488642fb579F8B00f3a590007251"
110-
111-
MAX_BLOCK_SIZE* = 10_485_760 # 10 MiB
112-
SAFETY_MARGIN* = 2_097_152 # 2 MiB
113-
MAX_RLP_BLOCK_SIZE* = MAX_BLOCK_SIZE - SAFETY_MARGIN
114110
# End

execution_chain/core/executor/process_block.nim

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
import
1414
../../common/common,
15-
../../constants,
1615
../../utils/utils,
1716
../../constants,
1817
../../db/ledger,
@@ -119,10 +118,6 @@ proc procBlkPreamble(
119118
if blk.transactions.calcTxRoot != header.txRoot:
120119
return err("Mismatched txRoot")
121120

122-
if com.isOsakaOrLater(header.timestamp):
123-
if rlp.getEncodedLength(blk) > MAX_RLP_BLOCK_SIZE:
124-
return err("Post-Osaka block exceeded MAX_RLP_BLOCK_SIZE")
125-
126121
if com.isPragueOrLater(header.timestamp):
127122
if header.requestsHash.isNone:
128123
return err("Post-Prague block header must have requestsHash")

execution_chain/core/tx_pool.nim

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,9 @@ proc assembleBlock*(
160160
blobsBundle = BlobsBundle(
161161
wrapperVersion: getWrapperVersion(com, blk.header.timestamp)
162162
)
163-
currentRlpSize = rlp.getEncodedLength(blk.header) + rlp.getEncodedLength(blk.withdrawals)
164163

165164
for item in pst.packedTxs:
166165
let tx = item.pooledTx
167-
if currentRlpSize > MAX_RLP_BLOCK_SIZE - 10:
168-
break
169-
currentRlpSize = currentRlpSize + rlp.getEncodedLength(tx.tx)
170166
blk.txs.add tx.tx
171167
if tx.blobsBundle != nil:
172168
doAssert(tx.blobsBundle.wrapperVersion == blobsBundle.wrapperVersion)

0 commit comments

Comments
 (0)