mirror of
https://github.com/OffchainLabs/prysm.git
synced 2026-01-07 22:54:17 -05:00
Revert Execution Requests in E2E (#15119)
* Revert "Disable Execution Request Testing On Mainnet (#15115)" This reverts commit70c31949ba. * Revert "Trigger Execution Requests In E2E (#14971)" This reverts commite38fdb09a4. * Changelog
This commit is contained in:
@@ -6,7 +6,6 @@ import (
|
||||
"context"
|
||||
"sync"
|
||||
|
||||
"github.com/ethereum/go-ethereum/common/hexutil"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/prysmaticlabs/prysm/v5/async"
|
||||
"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/signing"
|
||||
@@ -172,7 +171,7 @@ func createDepositData(privKey bls.SecretKey, pubKey bls.PublicKey, withExecCred
|
||||
if withExecCreds {
|
||||
newCredentials := make([]byte, 12)
|
||||
newCredentials[0] = params.BeaconConfig().ETH1AddressWithdrawalPrefixByte
|
||||
execAddr := bytesutil.ToBytes20(hexutil.MustDecode(executionAddress))
|
||||
execAddr := bytesutil.ToBytes20(pubKey.Marshal())
|
||||
depositMessage.WithdrawalCredentials = append(newCredentials, execAddr[:]...)
|
||||
}
|
||||
sr, err := depositMessage.HashTreeRoot()
|
||||
|
||||
@@ -184,10 +184,8 @@ func GethTestnetGenesis(genesisTime uint64, cfg *clparams.BeaconChainConfig) *co
|
||||
Mixhash: common.HexToHash(defaultMixhash),
|
||||
Coinbase: common.HexToAddress(defaultCoinbase),
|
||||
Alloc: types.GenesisAlloc{
|
||||
da.Address: da.Account,
|
||||
ma.Address: ma.Account,
|
||||
params.WithdrawalQueueAddress: {Nonce: 1, Code: params.WithdrawalQueueCode, Balance: common.Big0},
|
||||
params.ConsolidationQueueAddress: {Nonce: 1, Code: params.ConsolidationQueueCode, Balance: common.Big0},
|
||||
da.Address: da.Account,
|
||||
ma.Address: ma.Account,
|
||||
},
|
||||
ParentHash: common.HexToHash(defaultParenthash),
|
||||
}
|
||||
|
||||
@@ -23,8 +23,6 @@ import (
|
||||
|
||||
var errUnsupportedVersion = errors.New("schema version not supported by PremineGenesisConfig")
|
||||
|
||||
const executionAddress = "0x878705ba3f8bc32fcf7f4caa1a35e72af65cf766"
|
||||
|
||||
type PremineGenesisConfig struct {
|
||||
GenesisTime uint64
|
||||
NVals uint64
|
||||
|
||||
Reference in New Issue
Block a user