feat(tm2): Add Specific Block Height query Feature to ABCI Queries #2722

notJoon · 2024-08-22T02:52:10Z

Description

Added a new function that performs ABCI queries at a specific block height.

Modified ABCIQueryWithOptions in the RPC client to support querying at specific block heights.
Updated QueryHandler and QueryCfg to include height and prove options.

Contributors' checklist...

Added new tests, or not needed, or not feasible
Provided an example (e.g. screenshot) to aid review or the PR is self-explanatory
Updated the official documentation or not needed
No breaking changes were made, or a BREAKING CHANGE: xxx message was included in the description
Added references to related issues and PRs
Provided any useful hints for running manual tests
Added new benchmarks to generated graphs, if any. More info here.

codecov · 2024-08-22T02:56:56Z

Codecov Report

Attention: Patch coverage is 55.55556% with 24 lines in your changes missing coverage. Please review.

Project coverage is 63.09%. Comparing base (af05780) to head (463d612).

Files with missing lines	Patch %	Lines
tm2/pkg/sdk/baseapp.go	0.00%	17 Missing ⚠️
tm2/pkg/crypto/keys/client/query.go	63.15%	7 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #2722      +/-   ##
==========================================
- Coverage   63.32%   63.09%   -0.24%     
==========================================
  Files         548      548              
  Lines       78511    81354    +2843     
==========================================
+ Hits        49719    51327    +1608     
- Misses      25438    26591    +1153     
- Partials     3354     3436      +82

Flag	Coverage Δ
contribs/gnodev	`60.57% <ø> (ø)`
contribs/gnofaucet	`15.77% <ø> (+0.94%)`	⬆️
gno.land	`67.18% <ø> (ø)`
gnovm	`67.88% <ø> (ø)`
misc/genstd	`79.72% <ø> (ø)`
tm2	`62.39% <55.55%> (-0.03%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

r3v4s · 2024-08-26T02:59:51Z

Latest approach seems better than old one. However to fully support this functionality, I think we need pruning strategy. @zivkovicmilos Do we have any?

notJoon · 2024-08-26T05:15:02Z

we need pruning strategy.

I think this is probably related 🤔

https://github.com/gnolang/gno/blob/master/tm2/pkg/store/types/options.go#L10-L23

zivkovicmilos

Thank you for tackling this 🙏

I can't seem to make the querying work for custom heights. This simple post request:

{
    "id": 1,
    "jsonrpc": "2.0",
    "method": "abci_query",
    "params": [
        "bank/balances/g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5",
        "",
        "10", // HEIGHT
        false
    ]
}

Will return:

{
    "jsonrpc": "2.0",
    "id": 1,
    "result": {
        "response": {
            "ResponseBase": {
                "Error": {
                    "@type": "/std.InternalError"
                },
                "Data": null,
                "Events": null,
                "Log": "",
                "Info": ""
            },
            "Key": null,
            "Value": null,
            "Proof": null,
            "Height": "0"
        }
    }
}

The logs on the node would just have this:

ABCIQuery	{"module": "rpc", "path": "bank/balances/g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5", "data": "", "result": {"Error":{},"Data":null,"Events":null,"Log":"","Info":"","Key":null,"Value":null,"Proof":null,"Height":0}}

zivkovicmilos · 2024-09-12T12:17:45Z

tm2/pkg/bft/rpc/client/batch.go

+		"data":  data,
+		"prove": opts.Prove,
+	}
+	if opts.Height != 0 {


Just curious: isn't this misleading? Specifying 0 will cause an error down the line if I'm not mistaken, but in this case it will just continue on

hmm.. yes it would be clearer to only add the key if opts.Height is greater than 0

zivkovicmilos · 2024-09-12T12:18:44Z

tm2/pkg/bft/rpc/core/abci.go

@@ -56,6 +60,15 @@ import (
 // | height    | int64  | 0       | false    | Height (0 means latest)                        |
 // | prove     | bool   | false   | false    | Includes proof if true                         |
 func ABCIQuery(ctx *rpctypes.Context, path string, data []byte, height int64, prove bool) (*ctypes.ResultABCIQuery, error) {
+	if height < 0 {
+		return nil, errors.New("height cannot be negative")


This should be a standard error

zivkovicmilos · 2024-09-12T12:19:19Z

tm2/pkg/bft/rpc/core/abci.go

@@ -56,6 +60,15 @@ import (
 // | height    | int64  | 0       | false    | Height (0 means latest)                        |
 // | prove     | bool   | false   | false    | Includes proof if true                         |
 func ABCIQuery(ctx *rpctypes.Context, path string, data []byte, height int64, prove bool) (*ctypes.ResultABCIQuery, error) {


Can you please add a small unit test that verifies the errors?

I know our RPC testing suite is super janky, but it shouldn't be too much of a hassle to write a few cases

I promise refactoring this testing suite is on my bucket list

zivkovicmilos · 2024-09-12T12:21:30Z

tm2/pkg/sdk/baseapp.go

@@ -389,10 +392,6 @@ func (app *BaseApp) Query(req abci.RequestQuery) (res abci.ResponseQuery) {
 	default:
 		return handleQueryCustom(app, path, req)
 	}
-


Why remove this error wrap?

I removed it because it was unreacahble. I'll add the error message back in proper position

zivkovicmilos · 2024-09-12T12:22:47Z

tm2/pkg/sdk/baseapp.go

@@ -49,6 +49,7 @@ type BaseApp struct {
 	// See methods setCheckState and setDeliverState.
 	checkState   *state          // for CheckTx
 	deliverState *state          // for DeliverTx
+	currentState *state          // current state, set after Commit


This is always nil, I think you can drop it

zivkovicmilos · 2024-09-12T12:23:14Z

tm2/pkg/sdk/baseapp.go

@@ -487,7 +488,11 @@ func handleQueryCustom(app *BaseApp, path []string, req abci.RequestQuery) (res

 	// cache wrap the commit-multistore for safety
 	// XXX RunTxModeQuery?
-	ctx := NewContext(RunTxModeCheck, cacheMS, app.checkState.ctx.BlockHeader(), app.logger).WithMinGasPrices(app.minGasPrices)
+	// ctx := NewContext(RunTxModeCheck, cacheMS, app.checkState.ctx.BlockHeader(), app.logger).WithMinGasPrices(app.minGasPrices)


Why not remove the comment?

abci height

7b6810f

notJoon requested review from zivkovicmilos, leohhhn, gfanton, jaekwon, moul and piux2 as code owners August 22, 2024 02:52

github-actions bot assigned notJoon Aug 22, 2024

github-actions bot added 📦 🌐 tendermint v2 Issues or PRs tm2 related 📦 ⛰️ gno.land Issues or PRs gno.land package related labels Aug 22, 2024

notJoon marked this pull request as draft August 22, 2024 03:31

notJoon added 2 commits August 22, 2024 14:12

revert

265bdaf

fix

2fae41e

notJoon marked this pull request as ready for review August 23, 2024 02:43

notJoon requested a review from a team as a code owner August 23, 2024 02:43

dongwon8247 requested a review from r3v4s August 26, 2024 01:59

dongwon8247 mentioned this pull request Aug 28, 2024

Onbloc's Builder Journey gnolang/hackerspace#29

Open

michelleellen mentioned this pull request Sep 4, 2024

Minutes: Public Dev Calls [every Wednesday] gnolang/meetings#37

Open

zivkovicmilos requested changes Sep 12, 2024

View reviewed changes

notJoon marked this pull request as draft September 12, 2024 12:43

notJoon added 3 commits September 19, 2024 14:34

test

d1ff7ce

fix

9afbe23

Merge branch 'master' into abci-height

463d612

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(tm2): Add Specific Block Height query Feature to ABCI Queries #2722

feat(tm2): Add Specific Block Height query Feature to ABCI Queries #2722

notJoon commented Aug 22, 2024 •

edited

Loading

codecov bot commented Aug 22, 2024 •

edited

Loading

r3v4s commented Aug 26, 2024 •

edited

Loading

notJoon commented Aug 26, 2024 •

edited

Loading

zivkovicmilos left a comment

zivkovicmilos Sep 12, 2024

notJoon Sep 19, 2024

zivkovicmilos Sep 12, 2024

zivkovicmilos Sep 12, 2024

zivkovicmilos Sep 12, 2024

zivkovicmilos Sep 12, 2024

notJoon Sep 13, 2024

zivkovicmilos Sep 12, 2024

zivkovicmilos Sep 12, 2024

feat(tm2): Add Specific Block Height query Feature to ABCI Queries #2722

Are you sure you want to change the base?

feat(tm2): Add Specific Block Height query Feature to ABCI Queries #2722

Conversation

notJoon commented Aug 22, 2024 • edited Loading

Description

codecov bot commented Aug 22, 2024 • edited Loading

Codecov Report

r3v4s commented Aug 26, 2024 • edited Loading

notJoon commented Aug 26, 2024 • edited Loading

zivkovicmilos left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

notJoon commented Aug 22, 2024 •

edited

Loading

codecov bot commented Aug 22, 2024 •

edited

Loading

r3v4s commented Aug 26, 2024 •

edited

Loading

notJoon commented Aug 26, 2024 •

edited

Loading