Skip to content
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.

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

pectra devnet4: implement pectra devnet4 spec #3706

Merged
merged 53 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
bcb48d2
vm: update the system contract addresses for prague devnet4
g11tech Sep 27, 2024
1c30c2a
change the requests root from trie root to flat root and update examp…
g11tech Sep 29, 2024
73003e7
convert requests to flat type across util,block and vm
g11tech Sep 29, 2024
7cd91a2
bundle execution requests separately from execution payload
g11tech Sep 29, 2024
b4c704b
Merge branch 'master' into devnet4-contracts
jochem-brouwer Oct 10, 2024
420a7aa
t8ntool: update to devnet-4 interface support
jochem-brouwer Oct 10, 2024
1b65e0c
update devnet-4 to EIP PRs 8924, 8394
jochem-brouwer Oct 10, 2024
6d39f31
t8ntool hotfix to fix state tests
jochem-brouwer Oct 10, 2024
7d023c4
refactor cl requests to the new simplified version
g11tech Oct 11, 2024
2998547
remove requests from the block and modify associated code paths
g11tech Oct 11, 2024
5d2ede2
remove storing and retriving of requests from blockchain
g11tech Oct 11, 2024
5fe681b
modify the deposit, withdrawal and consolidation requests accumulatio…
g11tech Oct 11, 2024
613c900
modfiy the 7002 eip spec along with the new contract and debug and fi…
g11tech Oct 11, 2024
9b5caf2
modify code to correctly patch generated requests on getpayload/build…
g11tech Oct 11, 2024
a62ed49
fix the newpayload engine codeflow to validate the cl requests
g11tech Oct 11, 2024
7e898d4
remove the requests from eth rpc and blockfetcher p2p
g11tech Oct 11, 2024
a5aa2db
modify debug and fix 6110 deposit spec test
g11tech Oct 11, 2024
3eafb13
update the vm 7685 spec and add todos for later consideration
g11tech Oct 11, 2024
638acc3
fix t8ntool rq output
jochem-brouwer Oct 11, 2024
965eb86
vm: fix 6110 requests
jochem-brouwer Oct 11, 2024
2fea7ae
update request to just store bytes and expose getters for data and ty…
g11tech Oct 12, 2024
8b641de
repo: rename requestsRoot -> requestsHash
jochem-brouwer Oct 13, 2024
dae997e
vm: fix import (fix docker build)
jochem-brouwer Oct 14, 2024
bef2f34
client: correctly return request data (not including type)
jochem-brouwer Oct 14, 2024
860c621
fix the ingress, generation and propagation of execution requests/req…
g11tech Oct 14, 2024
a6dde76
Update 6110 example
scorbajio Oct 22, 2024
e7ba8b9
Use sha256 constant for default
scorbajio Oct 23, 2024
ee9a33d
Fix asserts
scorbajio Oct 23, 2024
239a63d
Add sha256 empty string constant
scorbajio Oct 23, 2024
4f9ae46
Update block REAME examples
scorbajio Oct 23, 2024
f0b5acc
Reuse already computed hash
scorbajio Oct 23, 2024
d7a33f8
Merge branch 'master' of github.com:ethereumjs/ethereumjs-monorepo in…
scorbajio Oct 23, 2024
676b93b
Fix buildBlock tests
scorbajio Oct 23, 2024
b1bae17
Fix vm api tests
scorbajio Oct 23, 2024
9d3652f
Fix client tests
scorbajio Oct 23, 2024
ea935e7
Fix tests
scorbajio Oct 23, 2024
7e1c382
packages: add requests hash to genesis block (#3771)
spencer-tb Oct 25, 2024
9d5822f
util: correctly report empty rq hash
jochem-brouwer Oct 26, 2024
dc93f8f
blockchain/util: remove sha256_empty_rh from exported util constants
jochem-brouwer Oct 28, 2024
9c64353
Merge branch 'master' into devnet4-contracts
scorbajio Oct 28, 2024
328cd53
Remove requests from being passed in as blockData
scorbajio Oct 28, 2024
c7f4640
Remove old tests that do not conform to new devnet4 specs
scorbajio Oct 28, 2024
a973b43
Remove old test that does not conform to new devnet4 specs
scorbajio Oct 28, 2024
000839d
make linter happy
jochem-brouwer Oct 31, 2024
d91b666
block: make tsc happy
jochem-brouwer Oct 31, 2024
84f40e3
block: remove obsolete examples
jochem-brouwer Oct 31, 2024
d3e6cca
util: make tsc happy
jochem-brouwer Oct 31, 2024
802145d
vm: make linter and tsc happy
jochem-brouwer Oct 31, 2024
88eb200
blockchain: make linter happy
jochem-brouwer Oct 31, 2024
adff539
vm: fix example
jochem-brouwer Oct 31, 2024
46ec57d
make cspell happy
jochem-brouwer Oct 31, 2024
5446fb8
client/util/vm: simplify CLRequest
jochem-brouwer Oct 31, 2024
152ae16
Merge branch 'master' into devnet4-contracts
acolytec3 Oct 31, 2024
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
20 changes: 10 additions & 10 deletions packages/client/test/rpc/engine/newPayloadV4.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ const [blockData] = beaconData

const parentBeaconBlockRoot = '0x42942949c4ed512cd85c2cb54ca88591338cbb0564d3a2bea7961a639ef29d64'
const validForkChoiceState = {
headBlockHash: '0x5040e6b0056398536751c187683a3ecde8aff8fd9ea1d3450d687d7032134caf',
safeBlockHash: '0x5040e6b0056398536751c187683a3ecde8aff8fd9ea1d3450d687d7032134caf',
finalizedBlockHash: '0x5040e6b0056398536751c187683a3ecde8aff8fd9ea1d3450d687d7032134caf',
headBlockHash: '0xdc1727ee420fead1d6a8dfe548758e5a5a48eed888b162278534b105b9909cf9',
safeBlockHash: '0xdc1727ee420fead1d6a8dfe548758e5a5a48eed888b162278534b105b9909cf9',
finalizedBlockHash: '0xdc1727ee420fead1d6a8dfe548758e5a5a48eed888b162278534b105b9909cf9',
}
const validPayloadAttributes = {
timestamp: '0x64ba84fd',
Expand All @@ -41,16 +41,16 @@ const electraGenesisContracts = {
code: '0x3373fffffffffffffffffffffffffffffffffffffffe1460575767ffffffffffffffff5f3511605357600143035f3511604b575f35612000014311604b57611fff5f3516545f5260205ff35b5f5f5260205ff35b5f5ffd5b5f35611fff60014303165500',
},
// consolidation requests contract
'0x00b42dbF2194e931E80326D950320f7d9Dbeac02': {
'0x00706203067988Ab3E2A2ab626EdCD6f28bDBbbb': {
balance: '0',
nonce: '1',
code: '0x3373fffffffffffffffffffffffffffffffffffffffe146098573615156028575f545f5260205ff35b36606014156101445760115f54600182026001905f5b5f82111560595781019083028483029004916001019190603e565b90939004341061014457600154600101600155600354806004026004013381556001015f35815560010160203581556001016040359055600101600355005b6003546002548082038060011160ac575060015b5f5b81811460f15780607402838201600402600401805490600101805490600101805490600101549260601b84529083601401528260340152906054015260010160ae565b9101809214610103579060025561010e565b90505f6002555f6003555b5f548061049d141561011d57505f5b6001546001828201116101325750505f610138565b01600190035b5f555f6001556074025ff35b5f5ffd',
code: '0x3373fffffffffffffffffffffffffffffffffffffffe1460a8573615156028575f545f5260205ff35b36606014156101555760115f54600182026001905f5b5f82111560595781019083028483029004916001019190603e565b90939004341061015557600154600101600155600354806004026004013381556001015f358155600101602035815560010160403590553360601b5f5260605f60143760745fa0600101600355005b6003546002548082038060011160bc575060015b5f5b8181146101025780607402838201600402600401805490600101805490600101805490600101549260601b84529083601401528260340152906054015260010160be565b9101809214610114579060025561011f565b90505f6002555f6003555b5f548061049d141561012e57505f5b6001546001828201116101435750505f610149565b01600190035b5f555f6001556074025ff35b5f5ffd',
},
// withdrawals request contract
'0x00A3ca265EBcb825B45F985A16CEFB49958cE017': {
'0x05F27129610CB42103b665629CB5c8C00296AaAa': {
balance: '0',
nonce: '1',
code: '0x3373fffffffffffffffffffffffffffffffffffffffe146090573615156028575f545f5260205ff35b366038141561012e5760115f54600182026001905f5b5f82111560595781019083028483029004916001019190603e565b90939004341061012e57600154600101600155600354806003026004013381556001015f3581556001016020359055600101600355005b6003546002548082038060101160a4575060105b5f5b81811460dd5780604c02838201600302600401805490600101805490600101549160601b83528260140152906034015260010160a6565b910180921460ed579060025560f8565b90505f6002555f6003555b5f548061049d141561010757505f5b60015460028282011161011c5750505f610122565b01600290035b5f555f600155604c025ff35b5f5ffd',
code: '0x3373fffffffffffffffffffffffffffffffffffffffe1460a0573615156028575f545f5260205ff35b366038141561013f5760115f54600182026001905f5b5f82111560595781019083028483029004916001019190603e565b90939004341061013f57600154600101600155600354806003026004013381556001015f35815560010160203590553360601b5f5260385f601437604c5fa0600101600355005b6003546002548082038060101160b4575060105b5f5b81811460ed5780604c02838201600302600401805490600101805490600101549160601b83528260140152906034015260010160b6565b910180921460fe5790600255610109565b90505f6002555f6003555b5f548061049d141561011857505f5b60015460028282011161012d5750505f610133565b01600290035b5f555f600155604c025ff35b5f5ffd',
storage: {
'0x0000000000000000000000000000000000000000000000000000000000000000':
'0x000000000000000000000000000000000000000000000000000000000000049d',
Expand Down Expand Up @@ -163,9 +163,9 @@ describe(`${method}: call with executionPayloadV4`, () => {
depositRequests: [],
withdrawalRequests: [],
consolidationRequests: [],
parentHash: '0x5040e6b0056398536751c187683a3ecde8aff8fd9ea1d3450d687d7032134caf',
stateRoot: '0xbde9840c609ffa39cae0a2c9e354ac673920fcc2a5e6faeef5b78817c7fba7dd',
blockHash: '0x6b3ee4bb75e316427142bb9b48629e3e87ed8eea9f6d42b6aae296a11ec920b3',
parentHash: '0xdc1727ee420fead1d6a8dfe548758e5a5a48eed888b162278534b105b9909cf9',
stateRoot: '0x42a2ea499b9805a99881ebb8057b7b336082a4890aac29f346064ca7a4777b82',
blockHash: '0xb8dd5003e1390c64eda06c87b931ede724905d4a33b77aba58c865bd2055c142',
}

const oldMethods = ['engine_newPayloadV1', 'engine_newPayloadV2', 'engine_newPayloadV3']
Expand Down
4 changes: 2 additions & 2 deletions packages/vm/src/params.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export const paramsVM: ParamsDict = {
7002: {
// config
systemAddress: '0xfffffffffffffffffffffffffffffffffffffffe', // The system address to perform operations on the withdrawal requests predeploy address
withdrawalRequestPredeployAddress: '0x00A3ca265EBcb825B45F985A16CEFB49958cE017', // Address of the validator excess address
withdrawalRequestPredeployAddress: '0x05F27129610CB42103b665629CB5c8C00296AaAa', // Address of the validator excess address
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the address of this commit: ethereum/EIPs@1335765

The latest commit (which shows up on eips.ethereum.org) is ethereum/EIPs@a23be81 pointing to 0x0511Ce19514e1298Fba96de582652A016E2CAaAa

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes @parithosh mentioned there are a few more updates coming through, so we gotta hold on

},

/**
Expand All @@ -87,6 +87,6 @@ export const paramsVM: ParamsDict = {
7251: {
// config
systemAddress: '0xfffffffffffffffffffffffffffffffffffffffe', // The system address to perform operations on the consolidation requests predeploy address
consolidationRequestPredeployAddress: '0x00b42dbF2194e931E80326D950320f7d9Dbeac02', // Address of the consolidations contract
consolidationRequestPredeployAddress: '0x00706203067988Ab3E2A2ab626EdCD6f28bDBbbb', // Address of the consolidations contract
},
}
Loading