Merge remote-tracking branch 'upstream/main'

Author: acolytec3

docs/reference/ethsimulatev1-notes.mdx

@@ -66,7 +66,7 @@ The default values of blocks and transactions can be overriden. For Transactions
 	"blobBaseFee": "0x15"
 },
 ```
-All the other fields are computed automatically (eg, `stateRoot` and `gasUsed`) or kept as their default values (eg. `uncles` or `withdrawals`). When overriding `number` and `time` variables for blocks, we automatically check that the block numbers and time fields are strictly increasing (we don't allow decreasing, or duplicated block numbers or times). If the block number is increased more than `1` compared to the previous block, new empty blocks are generated in between.
+All the other fields are computed automatically (e.g. `stateRoot` and `gasUsed`) or kept as their default values (e.g. `uncles` or `withdrawals`). When overriding `number` and `time` variables for blocks, we automatically check that the block numbers and time fields are strictly increasing (we don't allow decreasing, or duplicated block numbers or times). If the block number is increased more than `1` compared to the previous block, new empty blocks are generated in between.
 
 An interesting note here is that an user can specify block numbers and times of some blocks, but not for others. When block numbers of times are left unspecified, the default values will be used. After the blocks have been constructed, and default values are calculated, the blocks are checked that their block numbers and times are still valid.
 

src/engine/cancun.md

@@ -187,7 +187,7 @@ Refer to the specification for [`engine_getPayloadV2`](./shanghai.md#engine_getp
 
 Consensus layer clients **MAY** use this method to fetch blobs from the execution layer blob pool.
 
-*Note*: This is a new optional method introduced after Cancun. It is defined here because it is backwards-compatible with Cancun.
+*Note*: This is a new method introduced after Cancun. It is defined here because it is backwards-compatible with Cancun.
 
 #### Request
 

src/engine/osaka.md

@@ -108,9 +108,8 @@ Consensus layer clients **MAY** use this method to fetch blobs from the executio
 Refer to the specification for [`engine_getBlobsV1`](./cancun.md#engine_getblobsv1) with changes of the following:
 
 1. Given an array of blob versioned hashes client software **MUST** respond with an array of `BlobAndProofV2` objects with matching versioned hashes, respecting the order of versioned hashes in the input array.
-2. Client software **MUST** return `null` in case of any missing or older version blobs. For instance, 
-   1. if the request is `[A_versioned_hash, B_versioned_hash, C_versioned_hash]` and client software has data for blobs `A` and `C`, but doesn't have data for `B`, the response **MUST** be `null`.
-   2. if the request is `[A_versioned_hash_for_blob_with_blob_proof]`, the response **MUST** be `null` as well.
+1. Given an array of blob versioned hashes, if client software has every one of the requested blobs, it **MUST** return an array of `BlobAndProofV2` objects whose order exactly matches the input array. For instance, if the request is `[A_versioned_hash, B_versioned_hash, C_versioned_hash]` and client software has `A`, `B` and `C` available, the response **MUST** be `[A, B, C]`.
+2. If one or more of the requested blobs are unavailable, the client **MUST** return either `null` or an array of the same length and order, inserting `null` only at the positions of the missing blobs. For instance, if the request is `[A_versioned_hash, B_versioned_hash, C_versioned_hash]` and client software has data for blobs `A` and `C`, but doesn't have data for `B`, the response **MUST** be either `null` or `[A, null, C]`.
 3. Client software **MUST** support request sizes of at least 128 blob versioned hashes. The client **MUST** return `-38004: Too large request` error if the number of requested blobs is too large.
 4. Client software **MUST** return `null` if syncing or otherwise unable to serve blob pool data.
 5. Callers **MUST** consider that execution layer clients may prune old blobs from their pool, and will respond with `null` if a blob has been pruned.

wordlist.txt

@@ -71,11 +71,12 @@ forkchoiceupdatedresponsev
 feeRecipient
 multicallV
 EOA
+EOA's
 EVM
 ERC
 VM
 exitv
 txs
 UX
 simulateV
-EOA's
+EOA's