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.

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

Jump to bottom

vm: update the system contract addresses for prague devnet4 #3706

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

vm: update the system contract addresses for prague devnet4 #3706

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 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
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
View file
Open in desktop
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
View file
Open in desktop
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