[WIP] Withdrawals #4552

gezero · 2022-10-22T12:44:27Z

Signed-off-by: Jiri Peinlich jiri.peinlich@gmail.com

No tests so far, It compiles....

garyschulte · 2022-11-09T16:36:50Z

Marius' withdrawals test vectors:
https://hackmd.io/PqZgMpnkSWCWv5joJoFymQ

siladu · 2022-11-10T07:48:22Z

This is forkchoice request I used to test, adapted from the data in https://hackmd.io/PqZgMpnkSWCWv5joJoFymQ
I had to change the headBlockHash to match what besu thought it should be: either our config is wrong or the hash in the hackmd's fcU is wrong w.r.t. the provided genesis.
That different block hash is carried through to the other API calls in the comments below.

~~Currently the index, validatorIndex and amount values don't conform to the spec as they should be in hex.~~

{
  "jsonrpc": "2.0",
  "method": "engine_forkchoiceUpdatedV2",
  "params": [
    {
      "headBlockHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
      "safeBlockHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
      "finalizedBlockHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a"
    },
    {
      "timestamp": "0x50",
      "prevRandao": "0xff00000000000000000000000000000000000000000000000000000000000000",
      "suggestedFeeRecipient": "0xaa00000000000000000000000000000000000000",
      "withdrawals": [
        {
          "index": "0x0",
          "validatorIndex": "0xFFFF",
          "address": "0x0000000000000000000000000000000000000000",
          "amount": "0"
        },
        {
          "index": "0x1",
          "validatorIndex": "0x10000",
          "address": "0x0100000000000000000000000000000000000000",
          "amount": "0x100000000000000000000000000000000000000000000000000000000000000"
        },
        {
          "index": "0x2",
          "validatorIndex": "0x10001",
          "address": "0x0200000000000000000000000000000000000000",
          "amount": "0x200000000000000000000000000000000000000000000000000000000000000"
        },
        {
          "index": "0x3",
          "validatorIndex": "0x10002",
          "address": "0x0300000000000000000000000000000000000000",
          "amount": "0x300000000000000000000000000000000000000000000000000000000000000"
        },
        {
          "index": "0x4",
          "validatorIndex": "0x10003",
          "address": "0x0400000000000000000000000000000000000000",
          "amount": "0x400000000000000000000000000000000000000000000000000000000000000"
        },
        {
          "index": "0x5",
          "validatorIndex": "0x10004",
          "address": "0x0500000000000000000000000000000000000000",
          "amount": "0x500000000000000000000000000000000000000000000000000000000000000"
        },
        {
          "index": "0x6",
          "validatorIndex": "0x10005",
          "address": "0x0600000000000000000000000000000000000000",
          "amount": "0x600000000000000000000000000000000000000000000000000000000000000"
        },
        {
          "index": "0x7",
          "validatorIndex": "0x10006",
          "address": "0x0700000000000000000000000000000000000000",
          "amount": "0x700000000000000000000000000000000000000000000000000000000000000"
        }
      ]
    }
  ],
  "id": 68
}

siladu · 2022-11-11T05:52:11Z

Get Payload V2

{
    "jsonrpc": "2.0",
    "method": "engine_getPayloadV2",
    "params": [
      "0x0077c12559db3bb0"
    ],
    "id": 67
}

siladu · 2022-11-11T05:52:30Z

New Payload V2

{
    "jsonrpc": "2.0",
    "method": "engine_newPayloadV2",
    "params": [
        {
            "parentHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
            "feeRecipient": "0xaa00000000000000000000000000000000000000",
            "stateRoot": "0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
            "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
            "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
            "prevRandao": "0xff00000000000000000000000000000000000000000000000000000000000000",
            "blockNumber": "0x1",
            "gasLimit": "0x1c9c380",
            "gasUsed": "0x0",
            "timestamp": "0x13",
            "extraData": "0x",
            "baseFeePerGas": "0x7",
            "blockHash": "0x306a3844fc9b13239d1ea616e19c4991bb87cafef6c5c6dc0bae3d5b0b73d98e",
            "transactions": [],
            "withdrawals": [
                {
                    "index": "0x0",
                    "validatorIndex": "0xFFFF",
                    "address": "0x0000000000000000000000000000000000000000",
                    "amount": "0"
                },
                {
                    "index": "0x1",
                    "validatorIndex": "0x10000",
                    "address": "0x0100000000000000000000000000000000000000",
                    "amount": "0x100000000000000000000000000000000000000000000000000000000000000"
                },
                {
                    "index": "0x2",
                    "validatorIndex": "0x10001",
                    "address": "0x0200000000000000000000000000000000000000",
                    "amount": "0x200000000000000000000000000000000000000000000000000000000000000"
                },
                {
                    "index": "0x3",
                    "validatorIndex": "0x10002",
                    "address": "0x0300000000000000000000000000000000000000",
                    "amount": "0x300000000000000000000000000000000000000000000000000000000000000"
                },
                {
                    "index": "0x4",
                    "validatorIndex": "0x10003",
                    "address": "0x0400000000000000000000000000000000000000",
                    "amount": "0x400000000000000000000000000000000000000000000000000000000000000"
                },
                {
                    "index": "0x5",
                    "validatorIndex": "0x10004",
                    "address": "0x0500000000000000000000000000000000000000",
                    "amount": "0x500000000000000000000000000000000000000000000000000000000000000"
                },
                {
                    "index": "0x6",
                    "validatorIndex": "0x10005",
                    "address": "0x0600000000000000000000000000000000000000",
                    "amount": "0x600000000000000000000000000000000000000000000000000000000000000"
                },
                {
                    "index": "0x7",
                    "validatorIndex": "0x10006",
                    "address": "0x0700000000000000000000000000000000000000",
                    "amount": "0x700000000000000000000000000000000000000000000000000000000000000"
                }
            ]
        }
    ],
    "id": 67
}

siladu · 2022-11-11T05:53:19Z

fcU V2 following newPayload

{
  "jsonrpc": "2.0",
  "method": "engine_forkchoiceUpdatedV2",
  "params": [
    {
      "headBlockHash": "0x306a3844fc9b13239d1ea616e19c4991bb87cafef6c5c6dc0bae3d5b0b73d98e",
      "safeBlockHash": "0x306a3844fc9b13239d1ea616e19c4991bb87cafef6c5c6dc0bae3d5b0b73d98e",
      "finalizedBlockHash": "0x306a3844fc9b13239d1ea616e19c4991bb87cafef6c5c6dc0bae3d5b0b73d98e"
    }
  ],
  "id": 69
}

...ledger/besu/ethereum/api/jsonrpc/internal/parameters/EnginePayloadAttributesParameterV2.java

+      @JsonProperty("prevRandao") final String prevRandao,
+      @JsonProperty("suggestedFeeRecipient") final String suggestedFeeRecipient,
+      @JsonProperty("withdrawals") final List<WithdrawalParameter> withdrawals) {
+    this.timestamp = Long.decode(timestamp);


.../java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/WithdrawalParameter.java

Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>

Signed-off-by: Simon Dudley <simon.dudley@consensys.net> Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

Signed-off-by: Jason Frame <jason.frame@consensys.net>

…hortHexString) Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

This is probably temporary measure and we will need to detect the block using a timestamp in the future The shanghai.json is useless probably now Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>

Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>

…pella. This commit might break post-shanghai V2 until I switch the validation depending on the fork. Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

Hacky pre/post shanghai validation Serialize UInt64 toQuantityHexString instead of toShortHexString so 0 is returned as "0x0" instead of "0x" Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

…t contain null withdrawals This means shanghai can be activated before capella which makes devnets a lot smoother, rather than having to perfectly align capella timestamp with shanghaiBlock Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

…n rules Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

…that contain null withdrawals This was previously allowed to help with interop with clients that sometimes sent fcuV1 post-capella, but it was off-spec. Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

Signed-off-by: Jason Frame <jason.frame@consensys.net>

…bled at genesis Signed-off-by: Jason Frame <jason.frame@consensys.net>

Signed-off-by: Jason Frame <jason.frame@consensys.net>

siladu · 2022-12-21T04:30:31Z

Will likely close this in favour of #4758 since it is more up to date (has shanghaiTime merged in with fixes). Will leave open for now until @gezero confirms it's OK to close.

gezero force-pushed the eip-4895-withdrawals branch 12 times, most recently from 76a06b2 to 15ae2db Compare October 24, 2022 09:42

non-fungible-nelson added EIP Ethereum Improvement Proposal mainnet labels Nov 7, 2022

siladu added the TeamGroot GH issues worked on by Groot Team label Nov 10, 2022

siladu force-pushed the eip-4895-withdrawals branch from efde892 to f10a592 Compare November 10, 2022 04:09

siladu self-assigned this Nov 10, 2022

siladu force-pushed the eip-4895-withdrawals branch from 56b9d48 to 3c30ee7 Compare November 11, 2022 05:50

github-advanced-security bot found potential problems Nov 11, 2022

View reviewed changes

gezero force-pushed the eip-4895-withdrawals branch from f76a53c to 88f7217 Compare November 11, 2022 14:34

gezero and others added 5 commits November 15, 2022 08:49

Withdrawals WIP

2aaedd2

Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>

Compiling tests

fee0a1f

Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>

Reading of withdrawals is optional

90f9a04

Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>

Adding validator index

6e2608d

Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>

Add withdrawals to payloadAttributes in fcU and add to block proprosal

ddf620b

Signed-off-by: Simon Dudley <simon.dudley@consensys.net> Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

jframe and others added 5 commits November 15, 2022 08:49

Add toString to Withdrawal

ce92109

Signed-off-by: Jason Frame <jason.frame@consensys.net>

Use UInt64 for Withdrawal index fields and fix hex serialization (toS…

e147720

…hortHexString) Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

Adding shanghai fork as a block number

8e52115

This is probably temporary measure and we will need to detect the block using a timestamp in the future The shanghai.json is useless probably now Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>

withdrawals are now optional

2838b0f

Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>

Not sure why this one works over the other

dec2a6e

Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>

gezero force-pushed the eip-4895-withdrawals branch from f58aa28 to a69d099 Compare November 15, 2022 08:50

Fixing typo when reading config

0538244

Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>

gezero force-pushed the eip-4895-withdrawals branch from a69d099 to 0538244 Compare November 15, 2022 09:06

gezero and others added 9 commits November 15, 2022 09:23

spotless

2bdc6b9

Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>

Add pre-shanghai validation to V2 to support CLs sending V2 before Ca…

a1ef40e

…pella. This commit might break post-shanghai V2 until I switch the validation depending on the fork. Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

Handle null withdrawals in newPayloadV2

4efc31e

Hacky pre/post shanghai validation Serialize UInt64 toQuantityHexString instead of toShortHexString so 0 is returned as "0x0" instead of "0x" Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

Support pre/post-shanghai in ForkChoiceUpdatedV2

3fbb170

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

validate payload attributes based on chainHead + 1 shanghai activatio…

0b3c111

…n rules Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

Disallow post-shanghai (AllowedWithdrawals) to work with V1 requests …

e153bb5

…that contain null withdrawals This was previously allowed to help with interop with clients that sometimes sent fcuV1 post-capella, but it was off-spec. Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

Improve logging

8251af2

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

include withdrawalsRoot in eth_getBlock RPCs when it's not empty

cf28b55

Signed-off-by: Jason Frame <jason.frame@consensys.net>

jframe force-pushed the eip-4895-withdrawals branch from 6dff0fc to cf28b55 Compare November 30, 2022 07:40

jframe added 2 commits November 30, 2022 18:04

Use empty trie hash in genesis for withdrawalsRoot if shanghai is ena…

53cc102

…bled at genesis Signed-off-by: Jason Frame <jason.frame@consensys.net>

Fix Besu controllers tests after genesis state change

4f2f1fd

Signed-off-by: Jason Frame <jason.frame@consensys.net>

This was referenced Dec 5, 2022

Productionise Withdrawals Engine API Changes #4776

Closed

Productionise Withdrawals WIP #4777

Closed

Shanghai / Withdrawals Epic #4746

Closed

This was referenced Dec 14, 2022

Throwaway Withdrawals Testnet Branch (withdrawal-devnet-3) #4818

Closed

Withdrawals and timestamp #4758

Closed

siladu removed the TeamGroot GH issues worked on by Groot Team label Dec 22, 2022

siladu closed this Jan 4, 2023

siladu mentioned this pull request Jan 14, 2023

withdrawals-devnet-2 #4929

Closed

garyschulte mentioned this pull request Feb 24, 2023

propose Simon Dudley protocolguild/documentation#48

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] Withdrawals #4552

[WIP] Withdrawals #4552

gezero commented Oct 22, 2022

garyschulte commented Nov 9, 2022

siladu commented Nov 10, 2022 •

edited

Loading

siladu commented Nov 11, 2022 •

edited

Loading

siladu commented Nov 11, 2022 •

edited

Loading

siladu commented Nov 11, 2022

siladu commented Dec 21, 2022

[WIP] Withdrawals #4552

[WIP] Withdrawals #4552

Conversation

gezero commented Oct 22, 2022

garyschulte commented Nov 9, 2022

siladu commented Nov 10, 2022 • edited Loading

siladu commented Nov 11, 2022 • edited Loading

siladu commented Nov 11, 2022 • edited Loading

siladu commented Nov 11, 2022

siladu commented Dec 21, 2022

siladu commented Nov 10, 2022 •

edited

Loading

siladu commented Nov 11, 2022 •

edited

Loading

siladu commented Nov 11, 2022 •

edited

Loading