Merge pull request #169 from fjl/patch-1

Improve definition of log filter topic JSON type
ethereum · Jan 28, 2022 · 3a00485 · 3a00485
2 parents f731dbf + 3bf2cf7
commit 3a00485
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 deletions.
diff --git a/src/schemas/filter.json b/src/schemas/filter.json
@@ -52,19 +52,35 @@
 			},
 			"topics": {
 				"title": "Topics",
-				"$ref": "#/components/schemas/Topics"
+				"$ref": "#/components/schemas/FilterTopics"
 			}
 		}
 	},
-	"Topic": {
-		"title": "Topic",
-		"$ref": "#/components/schemas/uint256"
-	},
-	"Topics": {
-		"title": "Topics",
+	"FilterTopics": {
+		"title": "Filter Topics",
 		"type": "array",
 		"items": {
-			"$ref": "#/components/schemas/Topic"
+			"$ref": "#/components/schemas/FilterTopic"
 		}
+	},
+	"FilterTopic": {
+		"title": "Filter Topic List Entry",
+		"oneOf": [
+			{
+				"title": "Any Topic Match",
+				"type": "null"
+			},
+			{
+				"title": "Single Topic Match",
+				"$ref": "#/components/schemas/bytes32"
+			},
+			{
+				"title": "Multiple Topic Match",
+				"type": "array",
+				"items": {
+					"$ref": "#/components/schemas/bytes32"
+				}
+			}
+		]
 	}
 }
diff --git a/src/schemas/receipt.json b/src/schemas/receipt.json
@@ -37,7 +37,10 @@
 			},
 			"topics": {
 				"title": "topics",
-				"$ref": "#/components/schemas/Topics"
+				"type": "array",
+				"items": {
+					"$ref": "#/components/schemas/bytes32"
+				}
 			}
 		}
 	},