diff --git a/pom.xml b/pom.xml index 8cef9b8..b9e0c4a 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.wavesplatform protobuf-schemas jar - 1.5.3 + 1.6.0-SNAPSHOT Waves Node protobuf classes Waves Node protobuf java classes diff --git a/proto/waves/block.proto b/proto/waves/block.proto index 0ac6562..fba2f8f 100644 --- a/proto/waves/block.proto +++ b/proto/waves/block.proto @@ -31,6 +31,7 @@ message Block { bytes transactions_root = 10; bytes state_hash = 11; ChallengedHeader challenged_header = 12; + FinalizationVoting finalization_voting = 13; } Header header = 1; @@ -45,6 +46,7 @@ message MicroBlock { bytes sender_public_key = 4; repeated SignedTransaction transactions = 5; bytes state_hash = 6; + FinalizationVoting finalization_voting = 7; } message SignedMicroBlock { @@ -52,3 +54,17 @@ message SignedMicroBlock { bytes signature = 2; bytes total_block_id = 3; } + +message EndorseBlock { + int32 endorser_index = 1; + bytes finalized_block_id = 2; + uint32 finalized_block_height = 3; + bytes endorsed_block_id = 4; + bytes signature = 5; // BLS +} + +message FinalizationVoting { + repeated int32 endorser_indexes = 1; // In insertion order + bytes aggregated_endorsement_signature = 2; // BLS + repeated EndorseBlock conflict_endorsements = 3; // Without block_height +} diff --git a/proto/waves/transaction.proto b/proto/waves/transaction.proto index 9978f74..7c04a8d 100644 --- a/proto/waves/transaction.proto +++ b/proto/waves/transaction.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package waves; option java_package = "com.wavesplatform.protobuf.transaction"; @@ -43,6 +44,7 @@ message Transaction { InvokeScriptTransactionData invoke_script = 116; UpdateAssetInfoTransactionData update_asset_info = 117; InvokeExpressionTransactionData invoke_expression = 119; + CommitToGenerationTransactionData commit_to_generation = 120; }; }; @@ -154,3 +156,9 @@ message UpdateAssetInfoTransactionData { message InvokeExpressionTransactionData { bytes expression = 1; } + +message CommitToGenerationTransactionData { + uint32 generation_period_start = 1; + bytes endorser_public_key = 2; // BLS + bytes commitment_signature = 3; // BLS signature for endorser_public_key ++ generation_period_start +} diff --git a/proto/waves/transaction_state_snapshot.proto b/proto/waves/transaction_state_snapshot.proto index 8141c54..55cb24a 100644 --- a/proto/waves/transaction_state_snapshot.proto +++ b/proto/waves/transaction_state_snapshot.proto @@ -22,6 +22,7 @@ message TransactionStateSnapshot { repeated AccountData account_data = 12; repeated Sponsorship sponsorships = 13; TransactionStatus transaction_status = 14; + GenerationCommitment generation_commitment = 15; message Balance { bytes address = 1; @@ -95,6 +96,11 @@ message TransactionStateSnapshot { bytes asset_id = 1; int64 min_fee = 2; } + + message GenerationCommitment { + bytes sender_public_key = 1; + bytes endorser_public_key = 2; + } } enum TransactionStatus {