Merge pull request #5648 from LiskHQ/5647-udpate_protocol_spec

Fix outdated lisk-coded protocol spec - Closes #5647
LiskArchive · Aug 12, 2020 · 464da22 · 464da22
2 parents 7fe5a83 + 557dd04
commit 464da22
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 19 deletions.
diff --git a/protocol-specs/generator_outputs/lisk_codec/transaction_encodings.json b/protocol-specs/generator_outputs/lisk_codec/transaction_encodings.json
@@ -222,39 +222,43 @@
 					"$id": "baseTransactionSchema",
 					"type": "object",
 					"properties": {
-						"type": {
+						"moduleType": {
 							"dataType": "uint32",
 							"fieldNumber": 1
 						},
+						"assetType": {
+							"dataType": "uint32",
+							"fieldNumber": 2
+						},
 						"nonce": {
 							"dataType": "uint64",
-							"fieldNumber": 2
+							"fieldNumber": 3
 						},
 						"fee": {
 							"dataType": "uint64",
-							"fieldNumber": 3
+							"fieldNumber": 4
 						},
 						"senderPublicKey": {
 							"dataType": "bytes",
-							"fieldNumber": 4
+							"fieldNumber": 5
 						},
 						"asset": {
 							"dataType": "bytes",
-							"fieldNumber": 5
+							"fieldNumber": 6
 						},
 						"signatures": {
 							"type": "array",
 							"items": {
 								"dataType": "bytes"
 							},
-							"fieldNumber": 6
+							"fieldNumber": 7
 						}
 					},
 					"required": ["type", "nonce", "fee", "senderPublicKey", "asset"]
 				}
 			},
 			"output": {
-				"value": "080010d284cb8d9f82e50218eb9a89e10b22208f057d088a585d938c20d63e430a068d4cea384e588aa0b758c68fca21644dbc2a14f214d75bbc4b2ea89e433f3a45af803725416ec33240204514eb1152355799ece36d17037e5feb4871472c60763bdafe67eb6a38bec632a8e2e62f84a32cf764342a4708a65fbad194e37feec03940f0ff84d3df2a0532400b6730e5898ca56fe0dc1c73de9363f6fc8b335592ef10725a8463bff101a4943e60311f0b1a439a2c9e02cca1379b80a822f4ec48cf212bff1f1c757e92ec02"
+				"value": "0814100118d284cb8d9f82e50220eb9a89e10b2a208f057d088a585d938c20d63e430a068d4cea384e588aa0b758c68fca21644dbc3214f214d75bbc4b2ea89e433f3a45af803725416ec33a40204514eb1152355799ece36d17037e5feb4871472c60763bdafe67eb6a38bec632a8e2e62f84a32cf764342a4708a65fbad194e37feec03940f0ff84d3df2a053a400b6730e5898ca56fe0dc1c73de9363f6fc8b335592ef10725a8463bff101a4943e60311f0b1a439a2c9e02cca1379b80a822f4ec48cf212bff1f1c757e92ec02"
 			}
 		},
 		{

diff --git a/protocol-specs/generators/lisk_codec/proto_files/block.proto b/protocol-specs/generators/lisk_codec/proto_files/block.proto
@@ -19,12 +19,13 @@ message BlockHeader {
 }
 
 message BaseTransaction {
-	required uint32 type = 1;
-	required uint64 nonce = 2;
-	required uint64 fee = 3;
-	required bytes senderPublicKey = 4;
-	required bytes asset = 5;
-	repeated bytes signatures = 6;
+	required uint32 moduleType = 1;
+	required uint32 assetType = 2;
+	required uint64 nonce = 3;
+	required uint64 fee = 4;
+	required bytes senderPublicKey = 5;
+	required bytes asset = 6;
+	repeated bytes signatures = 7;
 }
 
 message Vote {

diff --git a/protocol-specs/generators/lisk_codec/types_generators/transaction.js b/protocol-specs/generators/lisk_codec/types_generators/transaction.js
@@ -27,12 +27,13 @@ const baseTransactionSchema = {
 	$id: 'baseTransactionSchema',
 	type: 'object',
 	properties: {
-		type: { dataType: 'uint32', fieldNumber: 1 },
-		nonce: { dataType: 'uint64', fieldNumber: 2 },
-		fee: { dataType: 'uint64', fieldNumber: 3 },
-		senderPublicKey: { dataType: 'bytes', fieldNumber: 4 },
-		asset: { dataType: 'bytes', fieldNumber: 5 },
-		signatures: { type: 'array', items: { dataType: 'bytes' }, fieldNumber: 6 },
+		moduleType: { dataType: 'uint32', fieldNumber: 1 },
+		assetType: { dataType: 'uint32', fieldNumber: 2 },
+		nonce: { dataType: 'uint64', fieldNumber: 3 },
+		fee: { dataType: 'uint64', fieldNumber: 4 },
+		senderPublicKey: { dataType: 'bytes', fieldNumber: 5 },
+		asset: { dataType: 'bytes', fieldNumber: 6 },
+		signatures: { type: 'array', items: { dataType: 'bytes' }, fieldNumber: 7 },
 	},
 	required: ['type', 'nonce', 'fee', 'senderPublicKey', 'asset'],
 };