Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
avalonche committed Jan 4, 2024
1 parent c91b043 commit 890dd7e
Show file tree
Hide file tree
Showing 4 changed files with 287 additions and 319 deletions.
8 changes: 2 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.20

require (
github.com/ethereum/go-ethereum v1.13.4
github.com/flashbots/go-boost-utils v1.7.1
github.com/flashbots/go-boost-utils v1.7.2-0.20230922193448-757aa4804cd5
github.com/flashbots/go-utils v0.5.0
github.com/google/uuid v1.3.1
github.com/gorilla/mux v1.8.0
Expand Down Expand Up @@ -59,7 +59,7 @@ require (
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
github.com/attestantio/go-builder-client v0.4.2
github.com/attestantio/go-eth2-client v0.19.7
github.com/attestantio/go-eth2-client v0.19.8
github.com/btcsuite/btcd v0.22.0-beta // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
Expand Down Expand Up @@ -87,7 +87,3 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace github.com/attestantio/go-eth2-client => github.com/avalonche/go-eth2-client v0.0.0-20231121172650-f072b1d01026

replace github.com/attestantio/go-builder-client => github.com/avalonche/go-builder-client v0.0.0-20231111000900-7bf594d0ffd3
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
github.com/avalonche/go-builder-client v0.0.0-20231111000900-7bf594d0ffd3 h1:NWvzzjgHsEgHkfLQgAZjewQtpIAhRXVYOTl7Eex4Chg=
github.com/avalonche/go-builder-client v0.0.0-20231111000900-7bf594d0ffd3/go.mod h1:3u2Y8lHSPFaNJSRG1QFQsh11w+x7+5SLBNM6ajbqyxU=
github.com/avalonche/go-eth2-client v0.0.0-20231121172650-f072b1d01026 h1:qjG4Q6JA26exlB7mhRpuAhNDP3CdNBB1RUvHKzzIk+A=
github.com/avalonche/go-eth2-client v0.0.0-20231121172650-f072b1d01026/go.mod h1:mZve1kV9Ctj0I1HH9gdg+MnI8lZ+Cb2EktEtOYrBlsM=
github.com/attestantio/go-builder-client v0.4.2 h1:EycfAFqQV+ooc2z6hmTsbuH4TCLknr0aO0nHLHLMpJM=
github.com/attestantio/go-builder-client v0.4.2/go.mod h1:e02i/WO4fjs3/u9oIZEjiC8CK1Qyxy4cpiMMGKx4VqQ=
github.com/attestantio/go-eth2-client v0.19.8 h1:7hn5X1MohW+wpfnwOpysPpjSktZwTB0A2ClohOCgZLI=
github.com/attestantio/go-eth2-client v0.19.8/go.mod h1:mZve1kV9Ctj0I1HH9gdg+MnI8lZ+Cb2EktEtOYrBlsM=
github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
Expand Down Expand Up @@ -98,8 +98,8 @@ github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBD
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
github.com/ferranbt/fastssz v0.1.3 h1:ZI+z3JH05h4kgmFXdHuR1aWYsgrg7o+Fw7/NCzM16Mo=
github.com/ferranbt/fastssz v0.1.3/go.mod h1:0Y9TEd/9XuFlh7mskMPfXiI2Dkw4Ddg9EyXt1W7MRvE=
github.com/flashbots/go-boost-utils v1.7.1 h1:JN0JFOCuuQoPhyZEaFxFHC2dWVScixItJ2nijzfE6IQ=
github.com/flashbots/go-boost-utils v1.7.1/go.mod h1:O2LUD1QAqi1oMzU1mtj7f1NMunNySJizQGrw7xujSe8=
github.com/flashbots/go-boost-utils v1.7.2-0.20230922193448-757aa4804cd5 h1:3OWpIpHHDd4bdOe+ZPGDuWefCkKctD6mVtgDkSHLkiA=
github.com/flashbots/go-boost-utils v1.7.2-0.20230922193448-757aa4804cd5/go.mod h1:gj0BOhAoMTTI/VVkAht+o2kMmSW7WqshyL9wY+lKKj4=
github.com/flashbots/go-utils v0.5.0 h1:ldjWta9B9//DJU2QcwRbErez3+1aKhSn6EoFc6d5kPY=
github.com/flashbots/go-utils v0.5.0/go.mod h1:LauDwifaRdSK0mS5X34GR59pJtUu1T/lOFNdff1BqtI=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
Expand Down
8 changes: 5 additions & 3 deletions server/service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,11 @@ func blindedBlockToExecutionPayloadCapella(signedBlindedBeaconBlock *eth2ApiV1Ca

func blindedBlockContentsToPayloadDeneb(signedBlindedBlockContents *eth2ApiV1Deneb.SignedBlindedBeaconBlock) *builderApiDeneb.ExecutionPayloadAndBlobsBundle {
header := signedBlindedBlockContents.Message.Body.ExecutionPayloadHeader
commitments := make([]deneb.KZGCommitment, 0)
proofs := make([]deneb.KZGProof, 0)
blobs := make([]deneb.Blob, 0)
numBlobs := len(signedBlindedBlockContents.Message.Body.BlobKZGCommitments)
commitments := make([]deneb.KZGCommitment, numBlobs)
copy(commitments, signedBlindedBlockContents.Message.Body.BlobKZGCommitments)
proofs := make([]deneb.KZGProof, numBlobs)
blobs := make([]deneb.Blob, numBlobs)
return &builderApiDeneb.ExecutionPayloadAndBlobsBundle{
ExecutionPayload: &deneb.ExecutionPayload{
ParentHash: header.ParentHash,
Expand Down
Loading

0 comments on commit 890dd7e

Please sign in to comment.