From f7b6886d47fdfe66e5f762854b3c5ba16a6036e6 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 07:35:17 +0000 Subject: [PATCH] fix: query tx events with `>=` and `<=` operators (backport #16994) (#16996) Co-authored-by: Rootul P --- tests/e2e/tx/service_test.go | 10 ++++++++++ x/auth/tx/service.go | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/tests/e2e/tx/service_test.go b/tests/e2e/tx/service_test.go index 93f93be9dc34..f174344aabe5 100644 --- a/tests/e2e/tx/service_test.go +++ b/tests/e2e/tx/service_test.go @@ -186,6 +186,16 @@ func TestEventRegex(t *testing.T) { event: "tx.signature='foobar/baz123=='", match: true, }, + { + name: "valid: with >= operator", + event: "tx.height>=10'", + match: true, + }, + { + name: "valid: with <= operator", + event: "tx.height<=10'", + match: true, + }, } for _, tc := range testCases { diff --git a/x/auth/tx/service.go b/x/auth/tx/service.go index e06aab1d4676..5b5f0bf5cc4e 100644 --- a/x/auth/tx/service.go +++ b/x/auth/tx/service.go @@ -45,7 +45,8 @@ var ( _ txtypes.ServiceServer = txServer{} // EventRegex checks that an event string is formatted with {alphabetic}.{alphabetic}={value} - EventRegex = regexp.MustCompile(`^[a-zA-Z_]+\.[a-zA-Z_]+=\S+$`) + // Note: in addition to equality, the `>=` and `<=` operators are also valid. + EventRegex = regexp.MustCompile(`^[a-zA-Z_]+\.[a-zA-Z_]+[<>]?=\S+$`) ) const (