Skip to content

Commit

Permalink
Merge pull request #932 from onflow/leo-add-signer-indices
Browse files Browse the repository at this point in the history
update block header, add signer indices
  • Loading branch information
zhangchiqing authored May 5, 2022
2 parents ce7871d + b96f722 commit e5427fd
Show file tree
Hide file tree
Showing 9 changed files with 87 additions and 51 deletions.
12 changes: 6 additions & 6 deletions protobuf/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Check out the [Flow Access API specification](/docs/content/access-api.md).
You can use [buf](https://github.com/bufbuild/buf) to generate gRPC client stubs in a variety of languages.
Please make sure you have `protoc-gen-go-grpc` installed, for example using command
```shell script
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.1.0
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2.0
```

Running the command below (in the current directory) will generate stubs for Go:
Expand All @@ -28,10 +28,10 @@ JVM support is in the alpha stage; many steps require manual intervention.

### Publishing

`./gradlew publishToSonatype` prepares and publishes compiled classes into JAR and uploads to OSSRH staging repository.
`./gradlew publishToSonatype` prepares and publishes compiled classes into JAR and uploads to OSSRH staging repository.

This requires signing artifacts which is done by [Signing Gradle plugin](https://docs.gradle.org/current/userguide/signing_plugin.html) - it requires
external configuration and appropriate GPG Keys. Please refer to plugin and [OSSRH](https://central.sonatype.org/pages/working-with-pgp-signatures.html)
This requires signing artifacts which is done by [Signing Gradle plugin](https://docs.gradle.org/current/userguide/signing_plugin.html) - it requires
external configuration and appropriate GPG Keys. Please refer to plugin and [OSSRH](https://central.sonatype.org/pages/working-with-pgp-signatures.html)
documentation.
Uploading to staging repo requires an approved Sonatype account. Please refer to [Gradle Nexus Publish Plugin](https://github.com/gradle-nexus/publish-plugin)
documentation how to provide credentials.
Uploading to staging repo requires an approved Sonatype account. Please refer to [Gradle Nexus Publish Plugin](https://github.com/gradle-nexus/publish-plugin)
documentation how to provide credentials.
3 changes: 2 additions & 1 deletion protobuf/flow/entities/block_header.proto
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ message BlockHeader {
google.protobuf.Timestamp timestamp = 4;
bytes payload_hash = 5;
uint64 view = 6;
repeated bytes parent_voter_ids = 7;
repeated bytes parent_voter_ids = 7; // deprecated!! value will be empty. replaced by parent_vote_indices
bytes parent_voter_sig_data = 8;
bytes proposer_id = 9;
bytes proposer_sig_data = 10;
string chain_id = 11;
bytes parent_voter_indices = 12;
}
5 changes: 3 additions & 2 deletions protobuf/flow/entities/collection.proto
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ message CollectionGuarantee {
repeated bytes signatures = 2;
bytes reference_block_id = 3;
bytes signature = 4;
repeated bytes signer_ids = 5;
}
repeated bytes signer_ids = 5; // deprecated!! value will be empty. replaced by signer_indices
bytes signer_indices = 6;
}
4 changes: 4 additions & 0 deletions protobuf/go/flow/access/access_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

57 changes: 33 additions & 24 deletions protobuf/go/flow/entities/block_header.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 27 additions & 18 deletions protobuf/go/flow/entities/collection.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions protobuf/go/flow/execution/execution_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions protobuf/go/flow/legacy/access/access_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions protobuf/go/flow/legacy/execution/execution_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 comment on commit e5427fd

@vercel
Copy link

@vercel vercel bot commented on e5427fd May 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

flow-docs – ./

docs.onflow.org
flow-docs.vercel.app
flow-docs-git-master-onflow.vercel.app
flow-docs-onflow.vercel.app

Please sign in to comment.