Skip to content

Cancun tests for devnet-8 #2931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jochem-brouwer wants to merge 5 commits into from
Closed

Cancun tests for devnet-8 #2931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fee61b6
hive cancun test runner [no ci]
jochem-brouwer Aug 1, 2023
635c23d
temp: update header to run hive genesis [no ci]
jochem-brouwer Aug 1, 2023
81dbfee
block/client: ensure eth_getBlock returns parentBeaconBlockRoot [no ci]
jochem-brouwer Aug 1, 2023
a3a13f9
client: add UNSUPPORTED_FORK error code [no ci]
jochem-brouwer Aug 2, 2023
e866679
client: fix replacement blob gas [no ci]
jochem-brouwer Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/block/src/header.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,6 @@ export class BlockHeader {
}
return this.cache.hash
}

return keccak256(RLP.encode(this.raw()))
}

Expand Down
1 change: 1 addition & 0 deletions packages/client/src/rpc/error-code.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ export const METHOD_NOT_FOUND = -32601
export const INVALID_PARAMS = -32602
export const INTERNAL_ERROR = -32603
export const TOO_LARGE_REQUEST = -38004
export const UNSUPPORTED_FORK = -38005
4 changes: 2 additions & 2 deletions packages/client/src/rpc/modules/engine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {

import { PendingBlock } from '../../miner'
import { short } from '../../util'
import { INTERNAL_ERROR, INVALID_PARAMS, TOO_LARGE_REQUEST } from '../error-code'
import { INTERNAL_ERROR, INVALID_PARAMS, TOO_LARGE_REQUEST, UNSUPPORTED_FORK } from '../error-code'
import { CLConnectionManager, middleware as cmMiddleware } from '../util/CLConnectionManager'
import { middleware, validators } from '../validation'

Expand Down Expand Up @@ -819,7 +819,7 @@ export class Engine {
const ts = parseInt(params[0].timestamp)
if (eip4844Timestamp === null || ts < eip4844Timestamp) {
throw {
code: INVALID_PARAMS,
code: UNSUPPORTED_FORK,
message: 'NewPayloadV{1|2} MUST be used before Cancun is activated',
}
}
Expand Down
1 change: 1 addition & 0 deletions packages/client/src/rpc/modules/eth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ const jsonRpcBlock = async (
...withdrawalsAttr,
blobGasUsed: header.blobGasUsed,
excessBlobGas: header.excessBlobGas,
parentBeaconBlockRoot: header.parentBeaconBlockRoot,
}
}

Expand Down
5 changes: 2 additions & 3 deletions packages/client/src/service/txpool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,8 @@ export class TxPool {

if (addedTx instanceof BlobEIP4844Transaction && existingTx instanceof BlobEIP4844Transaction) {
const minblobGasFee =
(existingTx.maxFeePerblobGas *
(existingTx.maxFeePerblobGas * BigInt(MIN_GAS_PRICE_BUMP_PERCENT))) /
BigInt(100)
existingTx.maxFeePerblobGas +
(existingTx.maxFeePerblobGas * BigInt(MIN_GAS_PRICE_BUMP_PERCENT)) / BigInt(100)
if (addedTx.maxFeePerblobGas < minblobGasFee) {
throw new Error('replacement blob gas too low')
}
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/hardforks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,6 +837,6 @@ export const hardforks: HardforksDict = {
'Next feature hardfork after the shanghai having proto-danksharding EIP 4844 blobs (still WIP hence not for production use), transient storage opcodes, parent beacon block root availability in EVM and selfdestruct only in same transaction',
url: 'https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/cancun.md',
status: Status.Final,
eips: [4844, 1153, 4788, 5656, 6780],
eips: [4844, 4788, 5656, 6780],
},
}