deploy: b04fe1f

print.html

@@ -9074,15 +9074,18 @@ <h4 id="eip1559params-encoding"><a class="header" href="#eip1559params-encoding"
 </div>
 <h3 id="execution-1"><a class="header" href="#execution-1">Execution</a></h3>
 <p>During execution, the EIP-1559 parameters used to calculate the next block base fee should come from the
-<code>PayloadAttributesV3</code> type rather than the previous protocol constants, if it is non-null.</p>
+parent header's <code>nonce</code> field rather than the previous protocol constants, if it is non-zero.</p>
 <ul>
-<li>If, before Holocene activation, <code>eip1559Parameters</code> is non-zero, the attributes are to be considered invalid by the
-engine.</li>
-<li>After Holocene activation:
+<li>If, before Holocene activation, <code>eip1559Parameters</code> in the <code>PayloadAttributesV3</code> is non-null, the attributes are to
+be considered invalid by the engine.</li>
+<li>At and after Holocene activation:
 <ul>
-<li>if <code>eip1559Params</code> is zero, the <a href="protocol/holocene/../exec-engine.html#1559-parameters">canyon base fee parameter constants</a> are
-used.</li>
-<li>if <code>eip1559Params</code> are non-null, the values from the attributes are used.</li>
+<li>if <code>eip1559Parameters</code> in the <code>PayloadAttributesV3</code> is null, the attributes are to be considered invalid by the
+engine.</li>
+<li>if <code>parent_header.nonce</code> is zero, the <a href="protocol/holocene/../exec-engine.html#1559-parameters">canyon base fee parameter constants</a> are
+used for the block's base fee parameters.</li>
+<li>if <code>parent_header.nonce</code> is non-zero, the EIP-1559 parameters encoded within the parent header's <code>nonce</code> field are
+used for the block's base fee parameters.</li>
 </ul>
 </li>
 </ul>
@@ -9092,10 +9095,11 @@ <h3 id="rationale-3"><a class="header" href="#rationale-3">Rationale</a></h3>
 section, the derivation pipeline must populate this field from the <code>SystemConfig</code> during payload building, similar to
 how it must reference the <code>SystemConfig</code> for the <code>gasLimit</code> field.</p>
 <h3 id="eip1559params-in-header"><a class="header" href="#eip1559params-in-header"><code>eip1559Params</code> in Header</a></h3>
-<p>Upon Holocene activation, the L2 block header's <code>nonce</code> field will consist of the 8-byte <code>eip1559Params</code> value.</p>
+<p>Upon Holocene activation, the L2 block header's <code>nonce</code> field will consist of the 8-byte <code>eip1559Params</code> value from
+the <code>PayloadAttributesV3</code>, or the canyon EIP-1559 constants if <code>eip1559Params</code> is equal to zero.</p>
 <h4 id="header-validity-rules"><a class="header" href="#header-validity-rules">Header Validity Rules</a></h4>
 <p>Prior to Holocene activation, the L2 block header's <code>nonce</code> field is valid iff it is equal to <code>u64(0)</code>.</p>
-<p>After Holocene activation, The L2 block header's <code>nonce</code> field is valid iff it is non-zero.</p>
+<p>At and after Holocene activation, The L2 block header's <code>nonce</code> field is valid iff it is non-zero.</p>
 <h4 id="encoding"><a class="header" href="#encoding">Encoding</a></h4>
 <p>The encoding of the <code>eip1559Params</code> value is described in <a href="protocol/holocene/exec-engine.html#eip1559params-encoding"><code>eip1559Params</code> encoding</a>.</p>
 <h4 id="rationale-4"><a class="header" href="#rationale-4">Rationale</a></h4>

protocol/holocene/exec-engine.html

@@ -246,15 +246,18 @@ <h4 id="eip1559params-encoding"><a class="header" href="#eip1559params-encoding"
 </div>
 <h3 id="execution"><a class="header" href="#execution">Execution</a></h3>
 <p>During execution, the EIP-1559 parameters used to calculate the next block base fee should come from the
-<code>PayloadAttributesV3</code> type rather than the previous protocol constants, if it is non-null.</p>
+parent header's <code>nonce</code> field rather than the previous protocol constants, if it is non-zero.</p>
 <ul>
-<li>If, before Holocene activation, <code>eip1559Parameters</code> is non-zero, the attributes are to be considered invalid by the
-engine.</li>
-<li>After Holocene activation:
+<li>If, before Holocene activation, <code>eip1559Parameters</code> in the <code>PayloadAttributesV3</code> is non-null, the attributes are to
+be considered invalid by the engine.</li>
+<li>At and after Holocene activation:
 <ul>
-<li>if <code>eip1559Params</code> is zero, the <a href="../exec-engine.html#1559-parameters">canyon base fee parameter constants</a> are
-used.</li>
-<li>if <code>eip1559Params</code> are non-null, the values from the attributes are used.</li>
+<li>if <code>eip1559Parameters</code> in the <code>PayloadAttributesV3</code> is null, the attributes are to be considered invalid by the
+engine.</li>
+<li>if <code>parent_header.nonce</code> is zero, the <a href="../exec-engine.html#1559-parameters">canyon base fee parameter constants</a> are
+used for the block's base fee parameters.</li>
+<li>if <code>parent_header.nonce</code> is non-zero, the EIP-1559 parameters encoded within the parent header's <code>nonce</code> field are
+used for the block's base fee parameters.</li>
 </ul>
 </li>
 </ul>
@@ -264,10 +267,11 @@ <h3 id="rationale"><a class="header" href="#rationale">Rationale</a></h3>
 section, the derivation pipeline must populate this field from the <code>SystemConfig</code> during payload building, similar to
 how it must reference the <code>SystemConfig</code> for the <code>gasLimit</code> field.</p>
 <h3 id="eip1559params-in-header"><a class="header" href="#eip1559params-in-header"><code>eip1559Params</code> in Header</a></h3>
-<p>Upon Holocene activation, the L2 block header's <code>nonce</code> field will consist of the 8-byte <code>eip1559Params</code> value.</p>
+<p>Upon Holocene activation, the L2 block header's <code>nonce</code> field will consist of the 8-byte <code>eip1559Params</code> value from
+the <code>PayloadAttributesV3</code>, or the canyon EIP-1559 constants if <code>eip1559Params</code> is equal to zero.</p>
 <h4 id="header-validity-rules"><a class="header" href="#header-validity-rules">Header Validity Rules</a></h4>
 <p>Prior to Holocene activation, the L2 block header's <code>nonce</code> field is valid iff it is equal to <code>u64(0)</code>.</p>
-<p>After Holocene activation, The L2 block header's <code>nonce</code> field is valid iff it is non-zero.</p>
+<p>At and after Holocene activation, The L2 block header's <code>nonce</code> field is valid iff it is non-zero.</p>
 <h4 id="encoding"><a class="header" href="#encoding">Encoding</a></h4>
 <p>The encoding of the <code>eip1559Params</code> value is described in <a href="#eip1559params-encoding"><code>eip1559Params</code> encoding</a>.</p>
 <h4 id="rationale-1"><a class="header" href="#rationale-1">Rationale</a></h4>