Merge pull request #126 from spacemeshos/add-atx-to-block

Add atx to block
spacemeshos · Dec 10, 2020 · 1052499 · 1052499
2 parents 7d0dfed + 1eb4a8b
commit 1052499
Show file tree

Hide file tree

Showing 4 changed files with 175 additions and 148 deletions.
diff --git a/proto/spacemesh/v1/mesh_types.proto b/proto/spacemesh/v1/mesh_types.proto
@@ -44,7 +44,7 @@ message LayerDurationResponse {
 message MaxTransactionsPerSecondRequest {}
 
 message MaxTransactionsPerSecondResponse {
-    SimpleInt maxtxpersecond = 1;
+    SimpleInt max_txs_per_second = 1;
 }
 
 enum AccountMeshDataFlag {

diff --git a/proto/spacemesh/v1/types.proto b/proto/spacemesh/v1/types.proto
@@ -102,7 +102,9 @@ message Reward {
 
 message Block {
     bytes id = 1; // block hash
-    repeated Transaction transactions = 2;
+    repeated Transaction transactions = 2; // block transactions
+    ActivationId activation_id = 3; // the smesher's activation that this block refers to
+    SmesherId smesher_id = 4; // the id of the smesher who submitted this block
 }
 
 message Layer {

diff --git a/release/go/spacemesh/v1/mesh_types.pb.go b/release/go/spacemesh/v1/mesh_types.pb.go