sunspirit

If this PR has not been assigned to anyone, I can do it

> @linhpn99 go ahead! @thehowl @leohhhn https://github.com/gnolang/gno/issues/2087 please take a look

this PR relates to https://github.com/gnolang/gno/issues/2045

@thehowl hope u give a review

@thehowl does my PR good enough to approve ?