Merge pull request hyperledger#33 from lightclient/fix-block-getters

Fix block getters
siladu · Jul 30, 2021 · 1788b41 · 1788b41
2 parents 0185ee7 + 09e8e1d
commit 1788b41
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 26 deletions.
diff --git a/scripts/build.js b/scripts/build.js
@@ -1,6 +1,6 @@
 import fs from "fs";
 
-console.log("Loading files...");
+console.log("Loading files...\n");
 
 let methods = [];
 let methodsBase = "src/methods/";

diff --git a/src/methods/block.json b/src/methods/block.json
@@ -9,6 +9,14 @@
 				"schema": {
 					"$ref": "#/components/schemas/hash32"
 				}
+			},
+			{
+				"name": "Full transactions",
+				"required": true,
+				"schema": {
+					"title": "fullTx",
+					"type": "boolean"
+				}
 			}
 		],
 		"result": {
@@ -28,6 +36,14 @@
 				"schema": {
 					"$ref": "#/components/schemas/uint"
 				}
+			},
+			{
+				"name": "Full transactions",
+				"required": true,
+				"schema": {
+					"title": "fullTx",
+					"type": "boolean"
+				}
 			}
 		],
 		"result": {

diff --git a/src/schemas/block.json b/src/schemas/block.json
@@ -1,6 +1,6 @@
 {
-	"Header": {
-		"title": "Header object",
+	"Block": {
+		"title": "Block object",
 		"type": "object",
 		"required": [
 			"parentHash",
@@ -17,7 +17,10 @@
 			"timestamp",
 			"extraData",
 			"mixHash",
-			"nonce"
+			"nonce",
+			"size",
+			"transactions",
+			"uncles"
 		],
 		"properties": {
 			"parentHash": {
@@ -40,15 +43,15 @@
 				"title": "Transactions root",
 				"$ref": "#/components/schemas/hash32"
 			},
-			"receiptRoot": {
+			"receiptsRoot": {
 				"title": "Receipts root",
 				"$ref": "#/components/schemas/hash32"
 			},
-			"bloom": {
+			"logsBloom": {
 				"title": "Bloom filter",
 				"$ref": "#/components/schemas/bytes256"
 			},
-			"totalDifficulty": {
+			"difficulty": {
 				"title": "Difficulty",
 				"$ref": "#/components/schemas/bytes"
 			},
@@ -77,36 +80,47 @@
 				"$ref": "#/components/schemas/hash32"
 			},
 			"nonce": {
-				"title": "nonce",
+				"title": "Nonce",
 				"$ref": "#/components/schemas/bytes"
 			},
+			"totalDifficulty": {
+				"title": "Total difficult",
+				"$ref": "#/components/schemas/uint"
+			},
 			"baseFeePerGas": {
 				"title": "Base fee per gas",
 				"$ref": "#/components/schemas/uint"
-			}
-		}
-	},
-	"Block": {
-		"title": "Block object",
-		"type": "object",
-		"required": ["transactions", "uncles"],
-		"allOf": [
-			{ "$ref": "#/components/schemas/Header" },
-			{
-				"title": "transactions",
-				"type": "array",
-				"items": {
-					"$ref": "#/components/schemas/hash32"
-				}
 			},
-			{
-				"title": "uncles",
+			"size": {
+				"title": "Block size",
+				"$ref": "#/components/schemas/uint"
+			},
+			"transactions": {
+				"oneOf": [
+					{
+						"title": "Transaction hashes",
+						"type": "array",
+						"items": {
+							"$ref": "#/components/schemas/hash32"
+						}
+					},
+					{
+						"title": "Full transactions",
+						"type": "array",
+						"items": {
+							"$ref": "#/components/schemas/SignedTransaction"
+						}
+					}
+				]
+			},
+			"uncles": {
+				"title": "Uncles",
 				"type": "array",
 				"items": {
 					"$ref": "#/components/schemas/hash32"
 				}
 			}
-		]
+		}
 	},
 	"BlockTag": {
 		"title": "Block tag",