Merge pull request #1183 from exonum/dynamic-services-upgraded-ECR-3664

Upgrade to newer core revision

Author: dmitry-timofeev

exonum-java-binding/common/src/main/java/com/exonum/binding/common/blockchain/TransactionResult.java

@@ -33,6 +33,7 @@
  * code and an optional description. Unexpected errors include only a description.
  */
 @AutoValue
+// todo: Fix the tx result support [ECR-3693]
 public abstract class TransactionResult {
 
   /** The maximum allowed user-defined transaction error code. */

exonum-java-binding/common/src/main/java/com/exonum/binding/common/message/TransactionMessage.java

@@ -27,10 +27,9 @@
 import com.exonum.binding.common.hash.HashCode;
 import com.exonum.binding.messages.Consensus;
 import com.exonum.binding.messages.Consensus.ExonumMessage;
-import com.exonum.binding.messages.Helpers;
-import com.exonum.binding.messages.Helpers.Signature;
 import com.exonum.binding.messages.Runtime.AnyTx;
 import com.exonum.binding.messages.Runtime.CallInfo;
+import com.exonum.binding.messages.Types;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.MessageLite;
@@ -191,11 +190,11 @@ public TransactionMessage sign(KeyPair keys, CryptoFunction crypto) {
       byte[] signature = crypto.signMessage(exonumMessage, keys.getPrivateKey());
 
       Consensus.SignedMessage signedMessage = Consensus.SignedMessage.newBuilder()
-          .setAuthor(Helpers.PublicKey.newBuilder()
+          .setAuthor(Types.PublicKey.newBuilder()
               .setData(ByteString.copyFrom(authorPublicKey.toBytes()))
               .build())
           .setPayload(ByteString.copyFrom(exonumMessage))
-          .setSignature(Signature.newBuilder()
+          .setSignature(Types.Signature.newBuilder()
               .setData(ByteString.copyFrom(signature))
               .build())
           .build();

exonum-java-binding/common/src/main/proto/blockchain.proto

@@ -16,25 +16,53 @@ syntax = "proto3";
 
 package exonum;
 
-import "helpers.proto";
+import "types.proto";
 
 option java_package = "com.exonum.binding.messages";
 
 message Block {
   uint32 proposer_id = 1;
   uint64 height = 2;
   uint32 tx_count = 3;
-  exonum.Hash prev_hash = 4;
-  exonum.Hash tx_hash = 5;
-  exonum.Hash state_hash = 6;
-}
-
-message ConfigReference {
-  uint64 actual_from = 1;
-  exonum.Hash cfg_hash = 2;
+  exonum.crypto.Hash prev_hash = 4;
+  exonum.crypto.Hash tx_hash = 5;
+  exonum.crypto.Hash state_hash = 6;
 }
 
 message TxLocation {
   uint64 block_height = 1;
   uint64 position_in_block = 2;
 }
+
+// Consensus configuration parameters
+
+// Public keys of a validator.
+message ValidatorKeys {
+  // Consensus key is used for messages related to the consensus algorithm.
+  exonum.crypto.PublicKey consensus_key = 1;
+  // Service key is used for services, for example, the configuration
+  // updater service, the anchoring service, etc.
+  exonum.crypto.PublicKey service_key = 2;
+}
+
+// Consensus algorithm parameters.
+message Config {
+  // List of validators public keys.
+  repeated ValidatorKeys validator_keys = 1;
+  // Interval between first two rounds.
+  uint64 first_round_timeout = 2;
+  // Period of sending a Status message.
+  uint64 status_timeout = 3;
+  // Peer exchange timeout.
+  uint64 peers_timeout = 4;
+  // Maximum number of transactions per block.
+  uint32 txs_block_limit = 5;
+  // Maximum message length (in bytes).
+  uint32 max_message_len = 6;
+  // Minimal propose timeout.
+  uint64 min_propose_timeout = 7;
+  // Maximal propose timeout.
+  uint64 max_propose_timeout = 8;
+  // Amount of transactions in pool to start use `min_propose_timeout`.
+  uint32 propose_timeout_threshold = 9;
+}

exonum-java-binding/common/src/main/proto/common.proto

@@ -0,0 +1,24 @@
+// Copyright 2019 The Exonum Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+package exonum.common;
+
+option java_package = "com.exonum.binding.messages";
+
+message BitVec {
+    bytes data = 1;
+    uint64 len = 2;
+}

exonum-java-binding/common/src/main/proto/consensus.proto

@@ -20,22 +20,23 @@ package exonum.consensus;
 
 option java_package = "com.exonum.binding.messages";
 
-import "helpers.proto";
+import "types.proto";
+import "common.proto";
 import "blockchain.proto";
 import "runtime.proto";
 import "google/protobuf/timestamp.proto";
 
 // Container for the signed messages.
 //
 // Keep in mind, that:
-// hash(SignedMessage) = hash(exonum_msg || key.bytes || sign.bytes)
+// hash(SignedMessage) = hash(payload || key.bytes || sign.bytes)
 message SignedMessage {
   // Message payload.
   bytes payload = 1;
   // Message author.
-  exonum.PublicKey author = 2;
+  exonum.crypto.PublicKey author = 2;
   // Digital signature.
-  exonum.Signature signature = 3;
+  exonum.crypto.Signature signature = 3;
 }
 
 // List of consensus messages
@@ -48,75 +49,75 @@ message Connect {
 
 message Status {
   uint64 height = 1;
-  exonum.Hash last_hash = 2;
+  exonum.crypto.Hash last_hash = 2;
   uint64 pool_size = 3;
 }
 
 message Propose {
   uint32 validator = 1;
   uint64 height = 2;
   uint32 round = 3;
-  exonum.Hash prev_hash = 4;
-  repeated exonum.Hash transactions = 5;
+  exonum.crypto.Hash prev_hash = 4;
+  repeated exonum.crypto.Hash transactions = 5;
 }
 
 message Prevote {
   uint32 validator = 1;
   uint64 height = 2;
   uint32 round = 3;
-  exonum.Hash propose_hash = 4;
+  exonum.crypto.Hash propose_hash = 4;
   uint32 locked_round = 5;
 }
 
 message Precommit {
   uint32 validator = 1;
   uint64 height = 2;
   uint32 round = 3;
-  exonum.Hash propose_hash = 4;
-  exonum.Hash block_hash = 5;
+  exonum.crypto.Hash propose_hash = 4;
+  exonum.crypto.Hash block_hash = 5;
   google.protobuf.Timestamp time = 6;
 }
 
 message BlockResponse {
-  exonum.PublicKey to = 1;
+  exonum.crypto.PublicKey to = 1;
   exonum.Block block = 2;
   repeated bytes precommits = 3;
-  repeated exonum.Hash transactions = 4;
+  repeated exonum.crypto.Hash transactions = 4;
 }
 
 message TransactionsResponse {
-  exonum.PublicKey to = 1;
+  exonum.crypto.PublicKey to = 1;
   repeated bytes transactions = 2;
 }
 
 message ProposeRequest {
-  exonum.PublicKey to = 1;
+  exonum.crypto.PublicKey to = 1;
   uint64 height = 2;
-  exonum.Hash propose_hash = 3;
+  exonum.crypto.Hash propose_hash = 3;
 }
 
 message TransactionsRequest {
-  exonum.PublicKey to = 1;
-  repeated exonum.Hash txs = 2;
+  exonum.crypto.PublicKey to = 1;
+  repeated exonum.crypto.Hash txs = 2;
 }
 
 message PrevotesRequest {
-  exonum.PublicKey to = 1;
+  exonum.crypto.PublicKey to = 1;
   uint64 height = 2;
   uint32 round = 3;
-  exonum.Hash propose_hash = 4;
-  exonum.BitVec validators = 5;
+  exonum.crypto.Hash propose_hash = 4;
+  exonum.common.BitVec validators = 5;
 }
 
-message PeersRequest { exonum.PublicKey to = 1; }
+message PeersRequest { exonum.crypto.PublicKey to = 1; }
 
 message BlockRequest {
-  exonum.PublicKey to = 1;
+  exonum.crypto.PublicKey to = 1;
   uint64 height = 2;
 }
 
 message PoolTransactionsRequest {
-  exonum.PublicKey to = 1;
+  exonum.crypto.PublicKey to = 1;
 }
 
 message ExonumMessage {

exonum-java-binding/common/src/main/proto/runtime.proto

@@ -16,15 +16,21 @@ syntax = "proto3";
 
 package exonum.runtime;
 
+/*
+  TODO: (All .proto) (1) Better package structure?
+    (2) Shall they all reside in common (i.e. are they all useful to any client)?
+ */
 option java_package = "com.exonum.binding.messages";
 
+import "blockchain.proto";
 import "google/protobuf/empty.proto";
 
 // Unique service transaction identifier.
 message CallInfo {
-  // Service instance identifier.
+  // Unique service instance identifier. The dispatcher uses this identifier to find the
+  // corresponding runtime to execute a transaction.
   uint32 instance_id = 1;
-  // Identifier of method in service interface to call.
+  // Identifier of the method in the service interface required for the call.
   uint32 method_id = 2;
 }
 
@@ -62,3 +68,21 @@ message ExecutionStatus {
     ExecutionError error = 2;
   }
 }
+
+// Configuration parameters of the certain service instance.
+message ServiceConfig {
+  // Corresponding service instance ID.
+  uint32 instance_id = 1;
+  // Raw bytes representation of service configuration parameters.
+  bytes params = 2;
+}
+
+// This message contains one atomic configuration change.
+message ConfigChange {
+  oneof message {
+    // New consensus config.
+    exonum.Config consensus = 1;
+    // New service instance config.
+    ServiceConfig service = 2;
+  }
+}

exonum-java-binding/common/src/main/proto/helpers.proto renamed to exonum-java-binding/common/src/main/proto/types.proto

@@ -14,7 +14,7 @@
 
 syntax = "proto3";
 
-package exonum;
+package exonum.crypto;
 
 option java_package = "com.exonum.binding.messages";
 
@@ -23,8 +23,3 @@ message Hash { bytes data = 1; }
 message PublicKey { bytes data = 1; }
 
 message Signature { bytes data = 1; }
-
-message BitVec {
-  bytes data = 1;
-  uint64 len = 2;
-}

exonum-java-binding/common/src/test/java/com/exonum/binding/common/message/ParsedTransactionMessageTest.java

@@ -25,10 +25,10 @@
 import com.exonum.binding.messages.Consensus;
 import com.exonum.binding.messages.Consensus.ExonumMessage;
 import com.exonum.binding.messages.Consensus.Prevote;
-import com.exonum.binding.messages.Helpers;
-import com.exonum.binding.messages.Helpers.Signature;
 import com.exonum.binding.messages.Runtime.AnyTx;
 import com.exonum.binding.messages.Runtime.CallInfo;
+import com.exonum.binding.messages.Types;
+import com.exonum.binding.messages.Types.Signature;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import nl.jqno.equalsverifier.EqualsVerifier;
@@ -63,7 +63,7 @@ void createSignedMessage() {
           .toByteArray();
 
       signedMessage = aSignedMessageProto()
-          .setAuthor(Helpers.PublicKey.newBuilder()
+          .setAuthor(Types.PublicKey.newBuilder()
               .setData(ByteString.copyFrom(authorPublicKey.toBytes()))
               .build())
           .setPayload(ByteString.copyFrom(exonumMessage))
@@ -163,7 +163,7 @@ private static Consensus.SignedMessage signedConsensusMessage(String payload) {
   private static Consensus.SignedMessage.Builder aSignedMessageProto() {
     return Consensus.SignedMessage.newBuilder()
         // Set the author only and keep the rest as defaults as the parser requires a non-empty key
-        .setAuthor(Helpers.PublicKey.newBuilder()
+        .setAuthor(Types.PublicKey.newBuilder()
             .setData(ByteString.copyFrom(bytes(1, 2, 3, 4)))
             .build());
   }

exonum-java-binding/common/src/test/java/com/exonum/binding/common/message/SignedMessageTest.java

@@ -29,8 +29,8 @@
 import com.exonum.binding.common.hash.HashCode;
 import com.exonum.binding.messages.Consensus;
 import com.exonum.binding.messages.Consensus.ExonumMessage;
-import com.exonum.binding.messages.Helpers;
-import com.exonum.binding.messages.Helpers.Signature;
+import com.exonum.binding.messages.Types;
+import com.exonum.binding.messages.Types.Signature;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import org.junit.jupiter.api.BeforeEach;
@@ -51,11 +51,11 @@ class ParsedFromTestData {
     @BeforeEach
     void createProtoMessage() {
       payload = ExonumMessage.getDefaultInstance();
-      Helpers.PublicKey authorPk = aPublicKey()
+      Types.PublicKey authorPk = aPublicKey()
           .setData(ByteString.copyFrom(TEST_PUBLIC_KEY.toBytes()))
           .build();
       testSignature = new byte[Ed25519.SIGNATURE_BYTES];
-      Helpers.Signature signature = aSignature()
+      Types.Signature signature = aSignature()
           .setData(ByteString.copyFrom(testSignature))
           .build();
       message = Consensus.SignedMessage.newBuilder()
@@ -105,8 +105,8 @@ void parseFromWrongMessage() {
   void parseFromPayloadNotExonumMessage() {
     ByteString invalidPayload = ByteString.copyFrom(
         bytes("Invalid payload: not an ExonumMessage"));
-    Helpers.PublicKey authorPk = aPublicKey().build();
-    Helpers.Signature signature = aSignature().build();
+    Types.PublicKey authorPk = aPublicKey().build();
+    Types.Signature signature = aSignature().build();
     byte[] message = Consensus.SignedMessage.newBuilder()
         .setPayload(invalidPayload)
         .setAuthor(authorPk)
@@ -118,12 +118,12 @@ void parseFromPayloadNotExonumMessage() {
     assertThrows(InvalidProtocolBufferException.class, () -> SignedMessage.parseFrom(message));
   }
 
-  private static Helpers.PublicKey.Builder aPublicKey() {
-    return Helpers.PublicKey.newBuilder()
+  private static Types.PublicKey.Builder aPublicKey() {
+    return Types.PublicKey.newBuilder()
         .setData(ByteString.copyFrom(TEST_PUBLIC_KEY.toBytes()));
   }
 
-  private static Helpers.Signature.Builder aSignature() {
+  private static Types.Signature.Builder aSignature() {
     byte[] testSignature = new byte[Ed25519.SIGNATURE_BYTES];
     return Signature.newBuilder()
         .setData(ByteString.copyFrom(testSignature));