forked from relayooor/go-ethereum
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add remote relay connection for getting validator data (ethereum#11)
* Add remote relay connection for getting validator data * Add block submission to remote relay * Adjust readme
- Loading branch information
Showing
17 changed files
with
905 additions
and
304 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,178 @@ | ||
| package builder | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| _ "os" | ||
|
|
||
| "github.com/ethereum/go-ethereum/common/hexutil" | ||
| "github.com/ethereum/go-ethereum/core/beacon" | ||
| "github.com/ethereum/go-ethereum/core/types" | ||
| "github.com/ethereum/go-ethereum/log" | ||
|
|
||
| "github.com/flashbots/go-boost-utils/bls" | ||
| boostTypes "github.com/flashbots/go-boost-utils/types" | ||
| ) | ||
|
|
||
| type PubkeyHex string | ||
|
|
||
| type ValidatorData struct { | ||
| Pubkey PubkeyHex | ||
| FeeRecipient boostTypes.Address `json:"feeRecipient"` | ||
| GasLimit uint64 `json:"gasLimit"` | ||
| Timestamp uint64 `json:"timestamp"` | ||
| } | ||
|
|
||
| type IBeaconClient interface { | ||
| isValidator(pubkey PubkeyHex) bool | ||
| getProposerForNextSlot(requestedSlot uint64) (PubkeyHex, error) | ||
| onForkchoiceUpdate() (uint64, error) | ||
| } | ||
|
|
||
| type IRelay interface { | ||
| SubmitBlock(msg *boostTypes.BuilderSubmitBlockRequest) error | ||
| GetValidatorForSlot(nextSlot uint64) (ValidatorData, error) | ||
| } | ||
|
|
||
| type Builder struct { | ||
| beaconClient IBeaconClient | ||
| relay IRelay | ||
|
|
||
| builderSecretKey *bls.SecretKey | ||
| builderPublicKey boostTypes.PublicKey | ||
| builderSigningDomain boostTypes.Domain | ||
| } | ||
|
|
||
| func NewBuilder(sk *bls.SecretKey, bc IBeaconClient, relay IRelay, builderSigningDomain boostTypes.Domain) *Builder { | ||
| pkBytes := bls.PublicKeyFromSecretKey(sk).Compress() | ||
| pk := boostTypes.PublicKey{} | ||
| pk.FromSlice(pkBytes) | ||
|
|
||
| _, err := bc.onForkchoiceUpdate() | ||
| if err != nil { | ||
| log.Error("could not initialize beacon client", "err", err) | ||
| } | ||
|
|
||
| return &Builder{ | ||
| beaconClient: bc, | ||
| relay: relay, | ||
| builderSecretKey: sk, | ||
| builderPublicKey: pk, | ||
|
|
||
| builderSigningDomain: builderSigningDomain, | ||
| } | ||
| } | ||
|
|
||
| func (b *Builder) onForkchoice(payloadAttributes *beacon.PayloadAttributesV1) { | ||
| dataJson, err := json.Marshal(payloadAttributes) | ||
| if err == nil { | ||
| log.Info("FCU", "data", string(dataJson)) | ||
| } else { | ||
| log.Info("FCU", "data", payloadAttributes, "parsingError", err) | ||
|
|
||
| } | ||
|
|
||
| nextSlot, err := b.beaconClient.onForkchoiceUpdate() | ||
| if err != nil { | ||
| log.Error("FCU hook failed", "err", err) | ||
| return | ||
| } | ||
|
|
||
| if payloadAttributes != nil { | ||
| payloadAttributes.Slot = nextSlot | ||
| if vd, err := b.relay.GetValidatorForSlot(nextSlot); err == nil { | ||
| payloadAttributes.SuggestedFeeRecipient = [20]byte(vd.FeeRecipient) | ||
| payloadAttributes.GasLimit = vd.GasLimit | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func (b *Builder) newSealedBlock(data *beacon.ExecutableDataV1, block *types.Block, payloadAttributes *beacon.PayloadAttributesV1) { | ||
| dataJson, err := json.Marshal(data) | ||
| if err == nil { | ||
| log.Info("newSealedBlock", "data", string(dataJson)) | ||
| } else { | ||
| log.Info("newSealedBlock", "data", data, "parsingError", err) | ||
| } | ||
| payload, err := executableDataToExecutionPayload(data) | ||
| if err != nil { | ||
| log.Error("could not format execution payload", "err", err) | ||
| return | ||
| } | ||
|
|
||
| vd, err := b.relay.GetValidatorForSlot(payloadAttributes.Slot) | ||
| if err != nil { | ||
| log.Error("could not get validator while submitting block", "err", err, "slot", payloadAttributes.Slot) | ||
| return | ||
| } | ||
|
|
||
| pubkey, err := boostTypes.HexToPubkey(string(vd.Pubkey)) | ||
| if err != nil { | ||
| log.Error("could not parse pubkey", "err", err, "pubkey", vd.Pubkey) | ||
| return | ||
| } | ||
|
|
||
| value := new(boostTypes.U256Str) | ||
| err = value.FromBig(block.Profit) | ||
| if err != nil { | ||
| log.Error("could not set block value", "err", err) | ||
| return | ||
| } | ||
|
|
||
| blockBidMsg := boostTypes.BidTraceMessage{ | ||
| Slot: payloadAttributes.Slot, | ||
| ParentHash: payload.ParentHash, | ||
| BlockHash: payload.BlockHash, | ||
| BuilderPubkey: b.builderPublicKey, | ||
| ProposerPubkey: pubkey, | ||
| ProposerFeeRecipient: boostTypes.Address(payloadAttributes.SuggestedFeeRecipient), | ||
| Value: *value, | ||
| } | ||
|
|
||
| signature, err := boostTypes.SignMessage(&blockBidMsg, b.builderSigningDomain, b.builderSecretKey) | ||
| if err != nil { | ||
| log.Error("could not sign builder bid", "err", err) | ||
| return | ||
| } | ||
|
|
||
| blockSubmitReq := boostTypes.BuilderSubmitBlockRequest{ | ||
| Signature: signature, | ||
| Message: &blockBidMsg, | ||
| ExecutionPayload: payload, | ||
| } | ||
|
|
||
| err = b.relay.SubmitBlock(&blockSubmitReq) | ||
| if err != nil { | ||
| log.Error("could not submit block", "err", err) | ||
| return | ||
| } | ||
| } | ||
|
|
||
| func executableDataToExecutionPayload(data *beacon.ExecutableDataV1) (*boostTypes.ExecutionPayload, error) { | ||
| transactionData := make([]hexutil.Bytes, len(data.Transactions)) | ||
| for i, tx := range data.Transactions { | ||
| transactionData[i] = hexutil.Bytes(tx) | ||
| } | ||
|
|
||
| baseFeePerGas := new(boostTypes.U256Str) | ||
| err := baseFeePerGas.FromBig(data.BaseFeePerGas) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &boostTypes.ExecutionPayload{ | ||
| ParentHash: [32]byte(data.ParentHash), | ||
| FeeRecipient: [20]byte(data.FeeRecipient), | ||
| StateRoot: [32]byte(data.StateRoot), | ||
| ReceiptsRoot: [32]byte(data.ReceiptsRoot), | ||
| LogsBloom: boostTypes.Bloom(types.BytesToBloom(data.LogsBloom)), | ||
| Random: [32]byte(data.Random), | ||
| BlockNumber: data.Number, | ||
| GasLimit: data.GasLimit, | ||
| GasUsed: data.GasUsed, | ||
| Timestamp: data.Timestamp, | ||
| ExtraData: data.ExtraData, | ||
| BaseFeePerGas: *baseFeePerGas, | ||
| BlockHash: [32]byte(data.BlockHash), | ||
| Transactions: transactionData, | ||
| }, nil | ||
| } |
Oops, something went wrong.