Skip to content

Commit

Permalink
deneb-support
Browse files Browse the repository at this point in the history
  • Loading branch information
@olegshmuelov
olegshmuelov committed Jan 14, 2024
1 parent 4a62c72 commit 248483f
Show file tree
Hide file tree
Showing 10 changed files with 492 additions and 462 deletions.
33 changes: 26 additions & 7 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,60 @@ module github.com/bloxapp/eth2-key-manager
go 1.18

require (
github.com/attestantio/go-eth2-client v0.15.2
github.com/attestantio/go-eth2-client v0.19.8
github.com/btcsuite/btcd/btcec/v2 v2.2.1
github.com/ferranbt/fastssz v0.1.2
github.com/ferranbt/fastssz v0.1.3
github.com/google/uuid v1.3.0
github.com/herumi/bls-eth-go-binary v1.28.1
github.com/pkg/errors v0.9.1
github.com/rs/zerolog v1.29.1
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.5.0
github.com/stretchr/testify v1.8.0
github.com/stretchr/testify v1.8.4
github.com/tyler-smith/go-bip39 v1.1.0
github.com/wealdtech/go-eth2-types/v2 v2.8.0
github.com/wealdtech/go-eth2-util v1.6.3
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
golang.org/x/text v0.3.7
golang.org/x/crypto v0.10.0
golang.org/x/text v0.10.0
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-playground/validator/v10 v10.10.0 // indirect
github.com/goccy/go-yaml v1.9.5 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/holiman/uint256 v1.2.2 // indirect
github.com/huandu/go-clone v1.6.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/klauspost/cpuid/v2 v2.2.1 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/minio/sha256-simd v1.0.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/prysmaticlabs/go-bitfield v0.0.0-20210809151128-385d8c5e3fb7 // indirect
github.com/r3labs/sse/v2 v2.10.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/wealdtech/go-bytesutil v1.1.1 // indirect
golang.org/x/sys v0.2.0 // indirect
go.opentelemetry.io/otel v1.16.0 // indirect
go.opentelemetry.io/otel/metric v1.16.0 // indirect
go.opentelemetry.io/otel/trace v1.16.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/sys v0.9.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
513 changes: 62 additions & 451 deletions go.sum
View file

Large diffs are not rendered by default.

80 changes: 80 additions & 0 deletions signer/dencun-devnet-12-deneb-blinded-block.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
{
"slot": "330420",
"proposer_index": "2989",
"parent_root": "0xb71e6d9234d751e1be8c9315e1a75a3b9deb0eefba3be0f07fe8986d8429c4c5",
"state_root": "0x3b12214235394d62f3a6fe542cc3f3dde32fdc4e7ef3bedcb5b6a942eb70e43d",
"body":
{
"randao_reveal": "0xa37c2a57eb741fcbd3a2bf6aa420e42bcb2b62fcdcc8aaf45e8349a9e4a8e296020abead458fe0c83370e7f0eb70aa2d00efce65645a9f54571f953732d981ad5dd1cb8324ecf21d49bf83de07eb2381f73f5186aa1847ab1ff022ad787961e1",
"eth1_data":
{
"deposit_root": "0xe5700ac7bf08aa474241beaab310610d5944343c12b12b9710fbce881d30f157",
"deposit_count": "850",
"block_hash": "0x75399ff8fe6bde7268d9ab755a1e3ede1289ee6f55c10745301f36afee5cad29"
},
"graffiti": "0x707279736d2d6e65746865726d696e642d31f09f90bc00000000000000000000",
"proposer_slashings":
[],
"attester_slashings":
[],
"attestations":
[
{
"aggregation_bits": "0x3ffffbfff7effeffffffffffd7ff",
"data":
{
"slot": "330419",
"index": "0",
"beacon_block_root": "0xb71e6d9234d751e1be8c9315e1a75a3b9deb0eefba3be0f07fe8986d8429c4c5",
"source":
{
"epoch": "10324",
"root": "0xfbc0ed105c2a3353b4ee92e635933c9e2f3727adfd596bc6d0cdb2fb9e7bcf53"
},
"target":
{
"epoch": "10325",
"root": "0x97329165314620e3052d95b034afe3b85e24affc08553a3afddbe238d2a9bb14"
}
},
"signature": "0xa5bdb24e552275ac5dfa78ea4fe6d964a21b91a62f3cbeb7bee94a5142a94da8300a804056545a1085adc0f780dade6a14aca2ec6f235424501bd16b6b9e800a54ed8f8b88acaabde39004f8eafc345fd43e699aa09f21085a694fd849ebd672"
}
],
"deposits":
[],
"voluntary_exits":
[],
"sync_aggregate":
{
"sync_committee_bits": "0xfffb7bffffedefffbfefffefbbbf773e7fff6bfb7f7ffeff7fffefffeffdffffffffffffffffffffe77fffdfdfb6fdf7ffffeffefefffffffffffeeffffdfdff",
"sync_committee_signature": "0x847ba9d7241b8134ac94b14c6c9e2dad2417c93127073df55bc0d078d9ef3207f2123de87576dcb23ba7f8805b3f6fd1054d9e58a31215e76ae2a20c390db51acd8d66959a646fad621ddfd70244dd960f46c92505db1600b5a4bc1051747332"
},
"execution_payload_header":
{
"parent_hash": "0xfa00af7d018fba68d09bdaa0d34d631d26391d0c3d9959d4fe47af68abaad465",
"fee_recipient": "0xf97e180c050e5ab072211ad2c213eb5aee4df134",
"state_root": "0x1bd7bfb6a183fdebf6639e42fa2f80216964b287f822a4f655aee65a260ea67d",
"receipts_root": "0x10457e39b8c68ced2071538b4c7034fe68f9c666187fd6b2d6ddcc21149f0d10",
"logs_bloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"prev_randao": "0x8c01a2115459154f92e0cb4d7f0ea012b19267cdb99108afb01c7241f7bf80ed",
"block_number": "314416",
"gas_limit": "30000000",
"gas_used": "42000",
"timestamp": "1705227840",
"extra_data": "0x4e65746865726d696e64",
"base_fee_per_gas": "9",
"block_hash": "0xb7a15466670218f30d73968a5f082f42c16fa1900b65dcb8326ce1bb4f3ddced",
"transactions_root": "0x2bdc18a7e09675c11341cecc5f0b6d7f26367bd8e2ddaeca3197c557477fa146",
"withdrawals_root": "0x8bc701c13e723b9b091594730cd155aec552bdc5d0c036117285e11a29c43302",
"blob_gas_used": "262144",
"excess_blob_gas": "0"
},
"bls_to_execution_changes":
[],
"blob_kzg_commitments":
[
"0x97808f75a6766619f3d39461fb7dc745d564d9cff78b10febb742451d8a1b4e568e6f4ba933f1151e2882eb7268b5de1",
"0xa927342c1afda8075953e164dc6b05ea458a66932a811e96979ce4828c2050ef01a11a42c3fec90d73ef6da042f1054e"
]
}
}
170 changes: 170 additions & 0 deletions signer/dencun-devnet-12-deneb-block.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
{
"slot": "330420",
"proposer_index": "2989",
"parent_root": "0xb71e6d9234d751e1be8c9315e1a75a3b9deb0eefba3be0f07fe8986d8429c4c5",
"state_root": "0x3b12214235394d62f3a6fe542cc3f3dde32fdc4e7ef3bedcb5b6a942eb70e43d",
"body":
{
"randao_reveal": "0xa37c2a57eb741fcbd3a2bf6aa420e42bcb2b62fcdcc8aaf45e8349a9e4a8e296020abead458fe0c83370e7f0eb70aa2d00efce65645a9f54571f953732d981ad5dd1cb8324ecf21d49bf83de07eb2381f73f5186aa1847ab1ff022ad787961e1",
"eth1_data":
{
"deposit_root": "0xe5700ac7bf08aa474241beaab310610d5944343c12b12b9710fbce881d30f157",
"deposit_count": "850",
"block_hash": "0x75399ff8fe6bde7268d9ab755a1e3ede1289ee6f55c10745301f36afee5cad29"
},
"graffiti": "0x707279736d2d6e65746865726d696e642d31f09f90bc00000000000000000000",
"proposer_slashings":
[],
"attester_slashings":
[],
"attestations":
[
{
"aggregation_bits": "0x3ffffbfff7effeffffffffffd7ff",
"data":
{
"slot": "330419",
"index": "0",
"beacon_block_root": "0xb71e6d9234d751e1be8c9315e1a75a3b9deb0eefba3be0f07fe8986d8429c4c5",
"source":
{
"epoch": "10324",
"root": "0xfbc0ed105c2a3353b4ee92e635933c9e2f3727adfd596bc6d0cdb2fb9e7bcf53"
},
"target":
{
"epoch": "10325",
"root": "0x97329165314620e3052d95b034afe3b85e24affc08553a3afddbe238d2a9bb14"
}
},
"signature": "0xa5bdb24e552275ac5dfa78ea4fe6d964a21b91a62f3cbeb7bee94a5142a94da8300a804056545a1085adc0f780dade6a14aca2ec6f235424501bd16b6b9e800a54ed8f8b88acaabde39004f8eafc345fd43e699aa09f21085a694fd849ebd672"
}
],
"deposits":
[],
"voluntary_exits":
[],
"sync_aggregate":
{
"sync_committee_bits": "0xfffb7bffffedefffbfefffefbbbf773e7fff6bfb7f7ffeff7fffefffeffdffffffffffffffffffffe77fffdfdfb6fdf7ffffeffefefffffffffffeeffffdfdff",
"sync_committee_signature": "0x847ba9d7241b8134ac94b14c6c9e2dad2417c93127073df55bc0d078d9ef3207f2123de87576dcb23ba7f8805b3f6fd1054d9e58a31215e76ae2a20c390db51acd8d66959a646fad621ddfd70244dd960f46c92505db1600b5a4bc1051747332"
},
"execution_payload":
{
"parent_hash": "0xfa00af7d018fba68d09bdaa0d34d631d26391d0c3d9959d4fe47af68abaad465",
"fee_recipient": "0xf97e180c050e5ab072211ad2c213eb5aee4df134",
"state_root": "0x1bd7bfb6a183fdebf6639e42fa2f80216964b287f822a4f655aee65a260ea67d",
"receipts_root": "0x10457e39b8c68ced2071538b4c7034fe68f9c666187fd6b2d6ddcc21149f0d10",
"logs_bloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"prev_randao": "0x8c01a2115459154f92e0cb4d7f0ea012b19267cdb99108afb01c7241f7bf80ed",
"block_number": "314416",
"gas_limit": "30000000",
"gas_used": "42000",
"timestamp": "1705227840",
"extra_data": "0x4e65746865726d696e64",
"base_fee_per_gas": "9",
"block_hash": "0xb7a15466670218f30d73968a5f082f42c16fa1900b65dcb8326ce1bb4f3ddced",
"transactions":
[
"0x03f89a8501a1f0ff46827e7984773594008504a817c80082520894a1a337814682c2ef4472b973bede1ec6764121ae8080c08504a817c800e1a0013ddb585ecad391a5ebc4e617fea3177085f01e1eed07fc2fdd65922c025be480a0d24593b9488f9b801d24879f243e2d15432878f51576ec6b0262e5b3c271dde6a006002f2cf0b212326f818673d465095ab39f004195dc13845aff9414eb5b2d3c",
"0x03f89a8501a1f0ff46827e0d84773594008504a817c80082520894a49dfd382668a2d7778fadd68da1bac21d3c78ac8080c08504a817c800e1a001202a9e88b22c99447314f72894e814b21319be54a1f84650a9ee64a90e7b2e80a040dfb67842f0e1902d94ca98baff20de2865951c0b49e3b412cf1522f3c127d3a06fb8c74c980f534e725567a12a921caaea6b108d247a5c4ada86f7661770f8e2"
],
"withdrawals":
[
{
"index": "4237745",
"validator_index": "2714",
"address": "0x388ea662ef2c223ec0b047d41bf3c0f362142ad5",
"amount": "1299"
},
{
"index": "4237746",
"validator_index": "2715",
"address": "0x388ea662ef2c223ec0b047d41bf3c0f362142ad5",
"amount": "1299"
},
{
"index": "4237747",
"validator_index": "2728",
"address": "0x388ea662ef2c223ec0b047d41bf3c0f362142ad5",
"amount": "1299"
},
{
"index": "4237748",
"validator_index": "2731",
"address": "0x388ea662ef2c223ec0b047d41bf3c0f362142ad5",
"amount": "1299"
},
{
"index": "4237749",
"validator_index": "2750",
"address": "0x388ea662ef2c223ec0b047d41bf3c0f362142ad5",
"amount": "1299"
},
{
"index": "4237750",
"validator_index": "2768",
"address": "0x388ea662ef2c223ec0b047d41bf3c0f362142ad5",
"amount": "1299"
},
{
"index": "4237751",
"validator_index": "2785",
"address": "0x388ea662ef2c223ec0b047d41bf3c0f362142ad5",
"amount": "1299"
},
{
"index": "4237752",
"validator_index": "2790",
"address": "0x388ea662ef2c223ec0b047d41bf3c0f362142ad5",
"amount": "1299"
},
{
"index": "4237753",
"validator_index": "2794",
"address": "0x388ea662ef2c223ec0b047d41bf3c0f362142ad5",
"amount": "1299"
},
{
"index": "4237754",
"validator_index": "2798",
"address": "0x388ea662ef2c223ec0b047d41bf3c0f362142ad5",
"amount": "1299"
},
{
"index": "4237755",
"validator_index": "2807",
"address": "0x388ea662ef2c223ec0b047d41bf3c0f362142ad5",
"amount": "1299"
},
{
"index": "4237756",
"validator_index": "2809",
"address": "0x388ea662ef2c223ec0b047d41bf3c0f362142ad5",
"amount": "1299"
},
{
"index": "4237757",
"validator_index": "2813",
"address": "0x388ea662ef2c223ec0b047d41bf3c0f362142ad5",
"amount": "1299"
},
{
"index": "4237758",
"validator_index": "2838",
"address": "0x388ea662ef2c223ec0b047d41bf3c0f362142ad5",
"amount": "1299"
}
],
"blob_gas_used": "262144",
"excess_blob_gas": "0"
},
"bls_to_execution_changes":
[],
"blob_kzg_commitments":
[
"0x97808f75a6766619f3d39461fb7dc745d564d9cff78b10febb742451d8a1b4e568e6f4ba933f1151e2882eb7268b5de1",
"0xa927342c1afda8075953e164dc6b05ea458a66932a811e96979ce4828c2050ef01a11a42c3fec90d73ef6da042f1054e"
]
}
}
3 changes: 3 additions & 0 deletions signer/sign_beacon_block.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ func (signer *SimpleSigner) SignBeaconBlock(b *spec.VersionedBeaconBlock, domain
block = b.Bellatrix
case spec.DataVersionCapella:
block = b.Capella
case spec.DataVersionDeneb:
block = b.Deneb

default:
return nil, nil, errors.Errorf("unsupported block version %d", b.Version)
}
Expand Down
Loading

0 comments on commit 248483f

Please sign in to comment.