change proto scheme: consistency with model

joeynor · Jul 19, 2017 · aaf3905 · aaf3905
1 parent 40f3922
commit aaf3905
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/schema/block.proto b/schema/block.proto
@@ -11,7 +11,7 @@ message Header {
 message Transaction {
 
   message Meta {
-    bytes creator_pubkey = 1;
+    string creator_account_id = 1;
     // used to prevent replay attacks.
     uint64  tx_counter = 2;
   }
@@ -30,7 +30,7 @@ message Block {
 
   message Meta {
     uint32             tx_number      = 1;  // the number of transactions inside. Maximum 16384 or 2^14
-    uint32             height         = 2;  // the current block number in a ledger
+    uint64             height         = 2;  // the current block number in a ledger
     bytes              merkle_root    = 3;  // global merkle root
     bytes              prev_block_hash      = 4; // Previous block hash
   }

diff --git a/schema/commands.proto b/schema/commands.proto
@@ -9,7 +9,7 @@ message AddAssetQuantity {
 
 message AddPeer {
     string address = 1;
-    string account_id = 2;
+    bytes peer_key = 2;
 }
 
 message AddSignatory {
@@ -53,12 +53,6 @@ message SetAccountQuorum {
     uint32 quorum = 2;
 }
 
-message SubtractAssetQuantity {
-    string account_id = 1;
-    string asset_id = 2;
-    string amount = 3;
-}
-
 message TransferAsset {
     string src_account_id = 1;
     string dest_account_id = 2;
@@ -76,9 +70,8 @@ message Command {
         CreateAccount create_account = 6;
         CreateDomain create_domain = 7;
         RemoveSignatory remove_sign = 8;
-        SubtractAssetQuantity subtract_asset_quantity = 9;
-        SetAccountPermissions set_permission = 10;
-        SetAccountQuorum    set_quorum = 11;
-        TransferAsset   transfer_asset = 12;
+        SetAccountPermissions set_permission = 9;
+        SetAccountQuorum    set_quorum = 10;
+        TransferAsset   transfer_asset = 11;
     }
 }