From 3f672fb7786dc61f93567487baa6ede7c76b0ba4 Mon Sep 17 00:00:00 2001 From: Mael Regnery Date: Wed, 27 Aug 2025 16:16:48 +0200 Subject: [PATCH 1/2] eth: add blockHash in Filter schema --- src/schemas/filter.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/schemas/filter.yaml b/src/schemas/filter.yaml index e2d4b1f3f..e4186a08c 100644 --- a/src/schemas/filter.yaml +++ b/src/schemas/filter.yaml @@ -20,6 +20,9 @@ Filter: toBlock: title: to block $ref: '#/components/schemas/uint' + blockHash: + title: block hash + $ref: '#/components/schemas/hash32' address: title: Address(es) oneOf: From 19668005ee363af2b789253b9ced23400e1a6882 Mon Sep 17 00:00:00 2001 From: Mael Regnery Date: Thu, 28 Aug 2025 14:24:51 +0200 Subject: [PATCH 2/2] fromBlock/toBlock and blockHash are mutually exclusive --- src/schemas/filter.yaml | 64 +++++++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/src/schemas/filter.yaml b/src/schemas/filter.yaml index e4186a08c..ee75ef77f 100644 --- a/src/schemas/filter.yaml +++ b/src/schemas/filter.yaml @@ -13,28 +13,48 @@ Filter: title: filter type: object additionalProperties: false - properties: - fromBlock: - title: from block - $ref: '#/components/schemas/uint' - toBlock: - title: to block - $ref: '#/components/schemas/uint' - blockHash: - title: block hash - $ref: '#/components/schemas/hash32' - address: - title: Address(es) - oneOf: - - title: Any Address - type: 'null' - - title: Address - $ref: '#/components/schemas/address' - - title: Addresses - $ref: '#/components/schemas/addresses' - topics: - title: Topics - $ref: '#/components/schemas/FilterTopics' + oneOf: + - title: Filter by block range + type: object + properties: + fromBlock: + title: from block + $ref: '#/components/schemas/uint' + toBlock: + title: to block + $ref: '#/components/schemas/uint' + address: + title: Address(es) + oneOf: + - title: Any Address + type: 'null' + - title: Address + $ref: '#/components/schemas/address' + - title: Addresses + $ref: '#/components/schemas/addresses' + topics: + title: Topics + $ref: '#/components/schemas/FilterTopics' + - title: Filter by block hash + type: object + properties: + blockHash: + title: block hash + $ref: '#/components/schemas/hash32' + address: + title: Address(es) + oneOf: + - title: Any Address + type: 'null' + - title: Address + $ref: '#/components/schemas/address' + - title: Addresses + $ref: '#/components/schemas/addresses' + topics: + title: Topics + $ref: '#/components/schemas/FilterTopics' + required: + - blockHash FilterTopics: title: Filter Topics oneOf: