AtHeartEngineer/prysm
1
0
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-09 21:38:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update EthereumAPIs (#4186)

Browse Source 
* include new patch targeting latest ethapis master
* ensure project builds
* Merge branch 'master' into update-all-api
* fix up committees
* Merge branch 'update-all-api' of github.com:prysmaticlabs/prysm into update-all-api
* include latest eth apis
* Merge branch 'master' into update-all-api
* update block tests
* Merge branch 'update-all-api' of github.com:prysmaticlabs/prysm into update-all-api
* Merge branch 'master' into update-all-api
* add todos
This commit is contained in:
Raul Jordan
2019-12-03 15:44:58 -08:00
committed by prylabs-bulldozer[bot]
parent 83781d0b74
commit c31f46d973
9 changed files with 95 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
third_party/com_github_prysmaticlabs_ethereumapis-tags.patch vendored
View File

@@ -255,7 +255,7 @@ index 69a148a..1b6ac18 100644
+ bytes signature = 4 [(gogoproto.moretags) = "ssz-size:\"96\""];
}
diff --git a/eth/v1alpha1/beacon_chain.proto b/eth/v1alpha1/beacon_chain.proto
index c31fe0f..ee2e2ec 100644
index 5389a4e..2029f0e 100644
--- a/eth/v1alpha1/beacon_chain.proto
+++ b/eth/v1alpha1/beacon_chain.proto
@@ -15,6 +15,7 @@ syntax = "proto3";
@@ -266,7 +266,7 @@ index c31fe0f..ee2e2ec 100644
import "google/api/annotations.proto";
import "google/protobuf/empty.proto";
@@ -76,9 +77,9 @@ service BeaconChain {
@@ -84,9 +85,9 @@ service BeaconChain {
};
}
@@ -279,7 +279,7 @@ index c31fe0f..ee2e2ec 100644
// This includes the head block slot and root as well as information about
// the most recent finalized and justified slots.
rpc StreamChainHead(google.protobuf.Empty) returns (stream ChainHead) {
@@ -278,7 +279,7 @@ message ChainHead {
@@ -290,7 +291,7 @@ message ChainHead {
uint64 head_epoch = 2;
// 32 byte merkle tree root of the canonical head block in the beacon node.
@@ -288,7 +288,7 @@ index c31fe0f..ee2e2ec 100644
// Most recent slot that contains the finalized block.
uint64 finalized_slot = 4;
@@ -287,7 +288,7 @@ message ChainHead {
@@ -299,7 +300,7 @@ message ChainHead {
uint64 finalized_epoch = 5;
// Most recent 32 byte finalized block root.
@@ -297,7 +297,7 @@ index c31fe0f..ee2e2ec 100644
// Most recent slot that contains the justified block.
uint64 justified_slot = 7;
@@ -296,7 +297,7 @@ message ChainHead {
@@ -308,7 +309,7 @@ message ChainHead {
uint64 justified_epoch = 8;
// Most recent 32 byte justified block root.
@@ -306,7 +306,7 @@ index c31fe0f..ee2e2ec 100644
// Most recent slot that contains the previous justified block.
uint64 previous_justified_slot = 10;
@@ -305,7 +306,7 @@ message ChainHead {
@@ -317,7 +318,7 @@ message ChainHead {
uint64 previous_justified_epoch = 11;
// Previous 32 byte justified block root.
@@ -315,7 +315,7 @@ index c31fe0f..ee2e2ec 100644
}
message ListCommitteesRequest {
@@ -363,7 +364,7 @@ message ListValidatorBalancesRequest {
@@ -362,7 +363,7 @@ message ListValidatorBalancesRequest {
// Validator 48 byte BLS public keys to filter validators for the given
// epoch.
@@ -324,7 +324,7 @@ index c31fe0f..ee2e2ec 100644
// Validator indices to filter validators for the given epoch.
repeated uint64 indices = 4;
@@ -384,7 +385,7 @@ message ValidatorBalances {
@@ -383,7 +384,7 @@ message ValidatorBalances {
message Balance {
// Validator's 48 byte BLS public key.
@@ -333,7 +333,16 @@ index c31fe0f..ee2e2ec 100644
// Validator's index in the validator set.
uint64 index = 2;
@@ -460,17 +461,17 @@ message ActiveSetChanges {
@@ -432,7 +433,7 @@ message GetValidatorRequest {
uint64 index = 1;
// 48 byte validator public key.
- bytes public_key = 2;
+ bytes public_key = 2 [(gogoproto.moretags) = "ssz-size:\"48\""];
}
}
@@ -469,17 +470,17 @@ message ActiveSetChanges {
uint64 epoch = 1;
// 48 byte validator public keys that have been activated in this epoch.
@@ -355,7 +364,7 @@ index c31fe0f..ee2e2ec 100644
}
message ValidatorQueue {
@@ -480,11 +481,11 @@ message ValidatorQueue {
@@ -489,11 +490,11 @@ message ValidatorQueue {
// Ordered list of 48 byte public keys awaiting activation. 0th index is the
// next key to be processed.
@@ -369,7 +378,7 @@ index c31fe0f..ee2e2ec 100644
}
message ListValidatorAssignmentsRequest {
@@ -496,7 +497,7 @@ message ListValidatorAssignmentsRequest {
@@ -505,7 +506,7 @@ message ListValidatorAssignmentsRequest {
bool genesis = 2;
}
// 48 byte validator public keys to filter assignments for the given epoch.
@@ -378,7 +387,7 @@ index c31fe0f..ee2e2ec 100644
// Validator indicies to filter assignments for the given epoch.
repeated uint64 indices = 4;
@@ -531,7 +532,7 @@ message ValidatorAssignments {
@@ -540,7 +541,7 @@ message ValidatorAssignments {
uint64 proposer_slot = 4;
// 48 byte BLS public key.
@@ -388,7 +397,7 @@ index c31fe0f..ee2e2ec 100644
// The epoch for which this set of validator assignments is valid.
diff --git a/eth/v1alpha1/validator.proto b/eth/v1alpha1/validator.proto
index a8c18fb..ca67c10 100644
index 9f07458..e30cd3f 100644
--- a/eth/v1alpha1/validator.proto
+++ b/eth/v1alpha1/validator.proto
@@ -15,6 +15,7 @@ syntax = "proto3";
@@ -399,7 +408,7 @@ index a8c18fb..ca67c10 100644
import "google/api/annotations.proto";
import "google/protobuf/empty.proto";
import "eth/v1alpha1/beacon_block.proto";
@@ -96,14 +97,14 @@ message DutiesRequest {
@@ -106,14 +107,14 @@ message DutiesRequest {
// Epoch at which validators should perform their duties.
uint64 epoch = 1;
// Array of byte encoded BLS public keys.
@@ -416,7 +425,7 @@ index a8c18fb..ca67c10 100644
// Slot at which a validator must attest.
uint64 attestation_slot = 2;
// Shard at which a validator must attest.
@@ -120,7 +121,7 @@ message BlockRequest {
@@ -130,7 +131,7 @@ message BlockRequest {
// Slot for which the block should be proposed.
uint64 slot = 1;
// Validator's 32 byte randao reveal secret of the current epoch.
@@ -425,7 +434,7 @@ index a8c18fb..ca67c10 100644
}
message AttestationDataRequest {
@@ -137,10 +138,10 @@ message AttestationDataRequest {
@@ -147,10 +148,10 @@ message AttestationDataRequest {
// An Ethereum 2.0 validator.
message Validator {
// 48 byte BLS public key used for the validator's activities.