From d78646ab8140cc211146039c5ac16fac0ef8c6c6 Mon Sep 17 00:00:00 2001 From: saiteja Date: Fri, 20 Sep 2024 10:24:36 +0530 Subject: [PATCH 1/3] refactor: fix query --- go.mod | 13 ---- go.sum | 40 ------------- keeper/query_server.go | 5 +- keeper/store.go | 14 ++++- proto/sdk/avail/v1beta1/query.proto | 5 +- types/query.pb.go | 92 +++++++++++++++++------------ 6 files changed, 71 insertions(+), 98 deletions(-) diff --git a/go.mod b/go.mod index 0095d91..8bed394 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,6 @@ require ( cosmossdk.io/log v1.3.1 cosmossdk.io/store v1.1.0 cosmossdk.io/x/upgrade v0.1.4 - github.com/centrifuge/go-substrate-rpc-client/v4 v4.2.1 github.com/cometbft/cometbft v0.38.10 github.com/cosmos/cosmos-proto v1.0.0-beta.5 github.com/cosmos/cosmos-sdk v0.50.8 @@ -100,7 +99,6 @@ require ( cosmossdk.io/x/tx v0.13.3 // indirect filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect - github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect github.com/DataDog/datadog-go v3.2.0+incompatible // indirect github.com/DataDog/zstd v1.5.5 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -124,9 +122,6 @@ require ( github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect github.com/danieljoos/wincred v1.1.2 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/deckarep/golang-set v1.8.0 // indirect - github.com/decred/base58 v1.0.4 // indirect - github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect github.com/dgraph-io/badger/v2 v2.2007.4 // indirect @@ -135,7 +130,6 @@ require ( github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.6.0 // indirect github.com/emicklei/dot v1.6.1 // indirect - github.com/ethereum/go-ethereum v1.10.20 // indirect github.com/fatih/color v1.15.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect @@ -143,7 +137,6 @@ require ( github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect - github.com/go-stack/stack v1.8.1 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -158,8 +151,6 @@ require ( github.com/gorilla/websocket v1.5.1 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect - github.com/gtank/merlin v0.1.1 // indirect - github.com/gtank/ristretto255 v0.1.2 // indirect github.com/hashicorp/go-hclog v1.5.0 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect github.com/hashicorp/go-metrics v0.5.3 // indirect @@ -182,7 +173,6 @@ require ( github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b // indirect github.com/minio/highwayhash v1.0.2 // indirect github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect @@ -191,7 +181,6 @@ require ( github.com/oklog/run v1.1.0 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect - github.com/pierrec/xxHash v0.1.5 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect @@ -210,7 +199,6 @@ require ( github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/tidwall/btree v1.7.0 // indirect - github.com/vedhavyas/go-subkey/v2 v2.0.0 // indirect github.com/zondax/hid v0.9.2 // indirect github.com/zondax/ledger-go v0.14.3 // indirect go.etcd.io/bbolt v1.3.8 // indirect @@ -226,7 +214,6 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/ini.v1 v1.67.0 // indirect - gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gotest.tools/v3 v3.5.1 // indirect nhooyr.io/websocket v1.8.10 // indirect diff --git a/go.sum b/go.sum index 8e4baea..3556dd7 100644 --- a/go.sum +++ b/go.sum @@ -805,8 +805,6 @@ github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= -github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= @@ -821,8 +819,6 @@ github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8= -github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I= @@ -852,8 +848,6 @@ github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= -github.com/availproject/go-substrate-rpc-client/v4 v4.1.0-avail-2.1.5-rc1 h1:mIYkc6eyi3iANW/dC+g7P49OfL54xnM61bq9B3a5pGw= -github.com/availproject/go-substrate-rpc-client/v4 v4.1.0-avail-2.1.5-rc1/go.mod h1:MeGquF7RkixfmXKXqwFF0a1iPLQiJGVlHjSLnJD4SD4= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= @@ -891,8 +885,6 @@ github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 h1:59Kx4K6lzOW5w6nFlA0v5+lk/6 github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= -github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ= -github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o= github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg= github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY= github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I= @@ -983,7 +975,6 @@ github.com/cosmos/cosmos-db v1.0.2 h1:hwMjozuY1OlJs/uh6vddqnk9j7VamLv+0DBlbEXbAK github.com/cosmos/cosmos-db v1.0.2/go.mod h1:Z8IXcFJ9PqKK6BIsVOB3QXtkKoqUOp1vRvPT39kOXEA= github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+RC5W7ZfmxJLA= github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec= -github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= @@ -1016,10 +1007,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4= -github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo= -github.com/decred/base58 v1.0.4 h1:QJC6B0E0rXOPA8U/kw2rP+qiRJsUaE2Er+pYb3siUeA= -github.com/decred/base58 v1.0.4/go.mod h1:jJswKPEdvpFpvf7dsDvFZyLT22xZ9lWqEByX38oGd9E= github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= @@ -1077,8 +1064,6 @@ github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6Ni github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= github.com/envoyproxy/protoc-gen-validate v1.0.1/go.mod h1:0vj8bNkYbSTNS2PIyH87KZaeN4x9zpL9Qt8fQC7d+vs= github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE= -github.com/ethereum/go-ethereum v1.10.20 h1:75IW830ClSS40yrQC1ZCMZCt5I+zU16oqId2SiQwdQ4= -github.com/ethereum/go-ethereum v1.10.20/go.mod h1:LWUN82TCHGpxB3En5HVmLLzPD7YSrEUFmFfN1nKkVN0= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= @@ -1138,8 +1123,6 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-ole/go-ole v1.2.1 h1:2lOsA72HgjxAuMlKpFiCbHTvu44PIVkZ5hqm3RSdI/E= -github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= @@ -1148,8 +1131,6 @@ github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+ github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw= -github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= @@ -1335,11 +1316,6 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4Zs github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= -github.com/gtank/merlin v0.1.1-0.20191105220539-8318aed1a79f/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= -github.com/gtank/merlin v0.1.1 h1:eQ90iG7K9pOhtereWsmyRJ6RAwcP4tHTDBHXNg+u5is= -github.com/gtank/merlin v0.1.1/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= -github.com/gtank/ristretto255 v0.1.2 h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uMzcc= -github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIvY4OmlYW69o= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= github.com/hashicorp/consul/api v1.25.1/go.mod h1:iiLVwR/htV7mas/sy0O+XSuEnrdBUUydemjxcUrAt4g= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= @@ -1522,9 +1498,6 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= -github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= -github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b h1:QrHweqAtyJ9EwCaGHBu1fghwxIPiopAHV06JlXrMHjk= -github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b/go.mod h1:xxLb2ip6sSUts3g1irPVHyk/DGslwQsNOo9I7smJfNU= github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY= github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= @@ -1634,8 +1607,6 @@ github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= -github.com/pierrec/xxHash v0.1.5 h1:n/jBpwTHiER4xYvK3/CdPVnLDPchj8eTJFFLUb4QHBo= -github.com/pierrec/xxHash v0.1.5/go.mod h1:w2waW5Zoa/Wc4Yqe0wgrIYAGKqRMf7czn2HNKXmuL+I= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= @@ -1726,8 +1697,6 @@ github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71e github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= -github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1:Bn1aCHHRnjv4Bl16T8rcaFjYSrGrIZvpiGO6P3Q4GpU= -github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -1800,10 +1769,6 @@ github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2l github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI= github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= -github.com/tklauser/go-sysconf v0.3.5 h1:uu3Xl4nkLzQfXNsWn15rPc/HQCJKObbt1dKJeWp3vU4= -github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= -github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefldA= -github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= @@ -1813,8 +1778,6 @@ github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/vedhavyas/go-subkey/v2 v2.0.0 h1:LemDIsrVtRSOkp0FA8HxP6ynfKjeOj3BY2U9UNfeDMA= -github.com/vedhavyas/go-subkey/v2 v2.0.0/go.mod h1:95aZ+XDCWAUUynjlmi7BtPExjXgXxByE0WfBwbmIRH4= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/vitwit/cosmos-sdk v0.50.6-0.20240905105834-9a5babf69986 h1:e38Z5AymIZ3dFCbAStFFo7baNnHYsHi8DTvMZHeoSfY= @@ -1900,7 +1863,6 @@ golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= @@ -2740,8 +2702,6 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= diff --git a/keeper/query_server.go b/keeper/query_server.go index 6c02a0b..9370bf6 100644 --- a/keeper/query_server.go +++ b/keeper/query_server.go @@ -25,14 +25,15 @@ func (qs queryServer) SubmittedBlobStatus(ctx context.Context, _ *types.QuerySub startHeight := qs.k.GetStartHeightFromStore(sdkCtx) endHeight := qs.k.GetEndHeightFromStore(sdkCtx) status := GetStatusFromStore(store) - blobStatus := ParseStatus(status) + blobStatus := ParseStatus(status, startHeight, endHeight) provenHeight := qs.k.GetProvenHeightFromStore(sdkCtx) votingEndHeight := qs.k.GetVotingEndHeightFromStore(sdkCtx, false) + votingEndsAt := ParseVotingEndHeight(votingEndHeight) return &types.QuerySubmittedBlobStatusResponse{ Range: &types.Range{From: startHeight, To: endHeight}, Status: blobStatus, ProvenHeight: provenHeight, - VotingEndsAt: votingEndHeight, + VotingEndsAt: votingEndsAt, }, nil } diff --git a/keeper/store.go b/keeper/store.go index a6fdb2e..7f4d1da 100644 --- a/keeper/store.go +++ b/keeper/store.go @@ -2,6 +2,7 @@ package keeper import ( "encoding/binary" + "fmt" "cosmossdk.io/collections" storetypes2 "cosmossdk.io/store/types" @@ -16,7 +17,11 @@ const ( FailureState uint32 = 3 ) -func ParseStatus(status uint32) string { +func ParseStatus(status uint32, start, end uint64) string { + if start == 0 && end == 0 { + return "" + } + switch status { case ReadyState: return "SUCCESS" @@ -31,6 +36,13 @@ func ParseStatus(status uint32) string { } } +func ParseVotingEndHeight(height uint64) string { + if height == 0 { + return "" + } + return fmt.Sprintln(height) +} + func CanUpdateStatusToPending(store storetypes2.KVStore) bool { statusBytes := store.Get(availblob1.BlobStatusKey) if len(statusBytes) == 0 { diff --git a/proto/sdk/avail/v1beta1/query.proto b/proto/sdk/avail/v1beta1/query.proto index 0805d18..8527726 100644 --- a/proto/sdk/avail/v1beta1/query.proto +++ b/proto/sdk/avail/v1beta1/query.proto @@ -1,10 +1,7 @@ syntax = "proto3"; package sdk.avail.v1beta1; -import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -import "sdk/avail/v1beta1/validator.proto"; -import "google/protobuf/timestamp.proto"; import "sdk/avail/v1beta1/tx.proto"; option go_package = "github.com/vitwit/avail-da-module/types"; @@ -18,7 +15,7 @@ message QuerySubmittedBlobStatusResponse { Range range = 1; string status = 2; uint64 proven_height = 3; - uint64 voting_ends_at = 4; + string voting_ends_at = 4; } // Query defines the gRPC querier service. diff --git a/types/query.pb.go b/types/query.pb.go index db109f8..b0c4f28 100644 --- a/types/query.pb.go +++ b/types/query.pb.go @@ -72,7 +72,7 @@ type QuerySubmittedBlobStatusResponse struct { Range *Range `protobuf:"bytes,1,opt,name=range,proto3" json:"range,omitempty"` Status string `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` ProvenHeight uint64 `protobuf:"varint,3,opt,name=proven_height,json=provenHeight,proto3" json:"proven_height,omitempty"` - VotingEndsAt uint64 `protobuf:"varint,4,opt,name=voting_ends_at,json=votingEndsAt,proto3" json:"voting_ends_at,omitempty"` + VotingEndsAt string `protobuf:"bytes,4,opt,name=voting_ends_at,json=votingEndsAt,proto3" json:"voting_ends_at,omitempty"` } func (m *QuerySubmittedBlobStatusResponse) Reset() { *m = QuerySubmittedBlobStatusResponse{} } @@ -129,11 +129,11 @@ func (m *QuerySubmittedBlobStatusResponse) GetProvenHeight() uint64 { return 0 } -func (m *QuerySubmittedBlobStatusResponse) GetVotingEndsAt() uint64 { +func (m *QuerySubmittedBlobStatusResponse) GetVotingEndsAt() string { if m != nil { return m.VotingEndsAt } - return 0 + return "" } func init() { @@ -144,33 +144,33 @@ func init() { func init() { proto.RegisterFile("sdk/avail/v1beta1/query.proto", fileDescriptor_30ff5d91ce731c68) } var fileDescriptor_30ff5d91ce731c68 = []byte{ - // 401 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x91, 0xcf, 0x6e, 0xd4, 0x30, - 0x10, 0xc6, 0xd7, 0xa5, 0xad, 0x84, 0xf9, 0x23, 0x61, 0x10, 0x8a, 0x22, 0x48, 0xd3, 0x2d, 0x88, - 0x95, 0x50, 0x63, 0x75, 0xfb, 0x04, 0xad, 0x84, 0xc4, 0x95, 0xf4, 0xc6, 0x65, 0x65, 0x63, 0xe3, - 0xb5, 0x9a, 0x78, 0xd2, 0x78, 0x12, 0xe8, 0x95, 0x27, 0x40, 0xe2, 0x31, 0x38, 0xf7, 0x1d, 0x38, - 0x56, 0xe2, 0xc2, 0x11, 0xed, 0xf2, 0x20, 0x68, 0xed, 0x08, 0x0e, 0xbb, 0x08, 0xf5, 0x96, 0x99, - 0xef, 0x37, 0x5f, 0x3e, 0xcf, 0xd0, 0xa7, 0x5e, 0x9d, 0x73, 0xd1, 0x0b, 0x5b, 0xf1, 0xfe, 0x48, - 0x6a, 0x14, 0x47, 0xfc, 0xa2, 0xd3, 0xed, 0x65, 0xd1, 0xb4, 0x80, 0xc0, 0x1e, 0x78, 0x75, 0x5e, - 0x04, 0xb9, 0x18, 0xe4, 0xf4, 0x91, 0x01, 0x03, 0x41, 0xe5, 0xab, 0xaf, 0x08, 0xa6, 0x4f, 0x0c, - 0x80, 0xa9, 0x34, 0x17, 0x8d, 0xe5, 0xc2, 0x39, 0x40, 0x81, 0x16, 0x9c, 0x1f, 0xd4, 0xfd, 0xf5, - 0xbf, 0xf4, 0xa2, 0xb2, 0x4a, 0x20, 0xb4, 0x03, 0xb2, 0x37, 0x18, 0x84, 0x4a, 0x76, 0xef, 0x39, - 0xda, 0x5a, 0x7b, 0x14, 0x75, 0x33, 0x00, 0xe9, 0xba, 0x07, 0x7e, 0x8c, 0xda, 0x78, 0x9f, 0xee, - 0xbd, 0x59, 0xa5, 0x3e, 0xeb, 0x64, 0x6d, 0x11, 0xb5, 0x3a, 0xad, 0x40, 0x9e, 0xa1, 0xc0, 0xce, - 0x97, 0xfa, 0xa2, 0xd3, 0x1e, 0xc7, 0x57, 0x84, 0xe6, 0xff, 0x66, 0x7c, 0x03, 0xce, 0x6b, 0x56, - 0xd0, 0x9d, 0x56, 0x38, 0xa3, 0x13, 0x92, 0x93, 0xc9, 0x9d, 0x69, 0x52, 0xac, 0x3d, 0xbf, 0x28, - 0x57, 0x7a, 0x19, 0x31, 0xf6, 0x98, 0xee, 0xfa, 0xe0, 0x90, 0x6c, 0xe5, 0x64, 0x72, 0xbb, 0x1c, - 0x2a, 0x76, 0x40, 0xef, 0x35, 0x2d, 0xf4, 0xda, 0xcd, 0xe6, 0xda, 0x9a, 0x39, 0x26, 0xb7, 0x72, - 0x32, 0xd9, 0x2e, 0xef, 0xc6, 0xe6, 0xeb, 0xd0, 0x63, 0xcf, 0xe8, 0xfd, 0x1e, 0xd0, 0x3a, 0x33, - 0xd3, 0x4e, 0xf9, 0x99, 0xc0, 0x64, 0x3b, 0x52, 0xb1, 0xfb, 0xca, 0x29, 0x7f, 0x82, 0xd3, 0x2b, - 0x42, 0x77, 0x42, 0x6e, 0xf6, 0x95, 0xd0, 0x87, 0x1b, 0xc2, 0xb3, 0xe9, 0x86, 0x94, 0xff, 0xd9, - 0x46, 0x7a, 0x7c, 0xa3, 0x99, 0xb8, 0x9d, 0xf1, 0xcb, 0x4f, 0xdf, 0x7f, 0x7d, 0xd9, 0x7a, 0xce, - 0x0e, 0xe2, 0x19, 0x64, 0x05, 0xf2, 0xcf, 0x29, 0x7c, 0x98, 0xfb, 0x3b, 0x74, 0x7a, 0xf2, 0x6d, - 0x91, 0x91, 0xeb, 0x45, 0x46, 0x7e, 0x2e, 0x32, 0xf2, 0x79, 0x99, 0x8d, 0xae, 0x97, 0xd9, 0xe8, - 0xc7, 0x32, 0x1b, 0xbd, 0x7d, 0x61, 0x2c, 0xce, 0x3b, 0x59, 0xbc, 0x83, 0x9a, 0xf7, 0x16, 0x3f, - 0x58, 0x8c, 0x7e, 0x87, 0x4a, 0x1c, 0xd6, 0xa0, 0xba, 0x4a, 0x73, 0xbc, 0x6c, 0xb4, 0x97, 0xbb, - 0xe1, 0xb8, 0xc7, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xcd, 0x4b, 0xa4, 0x7d, 0xa4, 0x02, 0x00, - 0x00, + // 402 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x91, 0xc1, 0x6e, 0xd4, 0x30, + 0x10, 0x86, 0xd7, 0xa5, 0xad, 0x84, 0x29, 0x48, 0x18, 0x84, 0xa2, 0x08, 0xd2, 0x74, 0x0b, 0x62, + 0x25, 0xd4, 0x58, 0xdd, 0x3e, 0x41, 0x2b, 0x21, 0x71, 0x25, 0xbd, 0x71, 0x59, 0xd9, 0xd8, 0x78, + 0xad, 0x26, 0x9e, 0x34, 0x9e, 0x04, 0x7a, 0xe5, 0x09, 0x90, 0x78, 0x0c, 0xce, 0x7d, 0x07, 0x8e, + 0x95, 0xb8, 0x70, 0x44, 0xbb, 0x3c, 0x08, 0x5a, 0x3b, 0x82, 0xc3, 0x2e, 0x42, 0xdc, 0x32, 0xf3, + 0xfd, 0xf3, 0xe7, 0xf7, 0x0c, 0x7d, 0xe2, 0xd5, 0x05, 0x17, 0xbd, 0xb0, 0x15, 0xef, 0x8f, 0xa5, + 0x46, 0x71, 0xcc, 0x2f, 0x3b, 0xdd, 0x5e, 0x15, 0x4d, 0x0b, 0x08, 0xec, 0xbe, 0x57, 0x17, 0x45, + 0xc0, 0xc5, 0x80, 0xd3, 0x87, 0x06, 0x0c, 0x04, 0xca, 0x57, 0x5f, 0x51, 0x98, 0x3e, 0x36, 0x00, + 0xa6, 0xd2, 0x5c, 0x34, 0x96, 0x0b, 0xe7, 0x00, 0x05, 0x5a, 0x70, 0x7e, 0xa0, 0x07, 0xeb, 0x7f, + 0xe9, 0x45, 0x65, 0x95, 0x40, 0x68, 0x07, 0xc9, 0xfe, 0x60, 0x10, 0x2a, 0xd9, 0xbd, 0xe3, 0x68, + 0x6b, 0xed, 0x51, 0xd4, 0xcd, 0x20, 0x48, 0xd7, 0x3d, 0xf0, 0x43, 0x64, 0xe3, 0x03, 0xba, 0xff, + 0x7a, 0x95, 0xfa, 0xbc, 0x93, 0xb5, 0x45, 0xd4, 0xea, 0xac, 0x02, 0x79, 0x8e, 0x02, 0x3b, 0x5f, + 0xea, 0xcb, 0x4e, 0x7b, 0x1c, 0x5f, 0x13, 0x9a, 0xff, 0x5d, 0xe3, 0x1b, 0x70, 0x5e, 0xb3, 0x82, + 0xee, 0xb4, 0xc2, 0x19, 0x9d, 0x90, 0x9c, 0x4c, 0xee, 0x4c, 0x93, 0x62, 0xed, 0xf9, 0x45, 0xb9, + 0xe2, 0x65, 0x94, 0xb1, 0x47, 0x74, 0xd7, 0x07, 0x87, 0x64, 0x2b, 0x27, 0x93, 0xdb, 0xe5, 0x50, + 0xb1, 0x43, 0x7a, 0xb7, 0x69, 0xa1, 0xd7, 0x6e, 0x36, 0xd7, 0xd6, 0xcc, 0x31, 0xb9, 0x95, 0x93, + 0xc9, 0x76, 0xb9, 0x17, 0x9b, 0xaf, 0x42, 0x8f, 0x3d, 0xa5, 0xf7, 0x7a, 0x40, 0xeb, 0xcc, 0x4c, + 0x3b, 0xe5, 0x67, 0x02, 0x93, 0xed, 0x60, 0xb2, 0x17, 0xbb, 0x2f, 0x9d, 0xf2, 0xa7, 0x38, 0xbd, + 0x26, 0x74, 0x27, 0xe4, 0x66, 0x5f, 0x08, 0x7d, 0xb0, 0x21, 0x3c, 0x9b, 0x6e, 0x48, 0xf9, 0x8f, + 0x6d, 0xa4, 0x27, 0xff, 0x35, 0x13, 0xb7, 0x33, 0x7e, 0xf1, 0xf1, 0xdb, 0xcf, 0xcf, 0x5b, 0xcf, + 0xd8, 0x61, 0x3c, 0x83, 0xac, 0x40, 0xfe, 0x3e, 0x85, 0x0f, 0x73, 0x7f, 0x86, 0xce, 0x4e, 0xbf, + 0x2e, 0x32, 0x72, 0xb3, 0xc8, 0xc8, 0x8f, 0x45, 0x46, 0x3e, 0x2d, 0xb3, 0xd1, 0xcd, 0x32, 0x1b, + 0x7d, 0x5f, 0x66, 0xa3, 0x37, 0xcf, 0x8d, 0xc5, 0x79, 0x27, 0x8b, 0xb7, 0x50, 0xf3, 0xde, 0xe2, + 0x7b, 0x8b, 0xd1, 0xef, 0x48, 0x89, 0xa3, 0x1a, 0x54, 0x57, 0x69, 0x8e, 0x57, 0x8d, 0xf6, 0x72, + 0x37, 0x1c, 0xf7, 0xe4, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x48, 0xc8, 0x8a, 0x9b, 0xa4, 0x02, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -298,10 +298,12 @@ func (m *QuerySubmittedBlobStatusResponse) MarshalToSizedBuffer(dAtA []byte) (in _ = i var l int _ = l - if m.VotingEndsAt != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.VotingEndsAt)) + if len(m.VotingEndsAt) > 0 { + i -= len(m.VotingEndsAt) + copy(dAtA[i:], m.VotingEndsAt) + i = encodeVarintQuery(dAtA, i, uint64(len(m.VotingEndsAt))) i-- - dAtA[i] = 0x20 + dAtA[i] = 0x22 } if m.ProvenHeight != 0 { i = encodeVarintQuery(dAtA, i, uint64(m.ProvenHeight)) @@ -367,8 +369,9 @@ func (m *QuerySubmittedBlobStatusResponse) Size() (n int) { if m.ProvenHeight != 0 { n += 1 + sovQuery(uint64(m.ProvenHeight)) } - if m.VotingEndsAt != 0 { - n += 1 + sovQuery(uint64(m.VotingEndsAt)) + l = len(m.VotingEndsAt) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) } return n } @@ -546,10 +549,10 @@ func (m *QuerySubmittedBlobStatusResponse) Unmarshal(dAtA []byte) error { } } case 4: - if wireType != 0 { + if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field VotingEndsAt", wireType) } - m.VotingEndsAt = 0 + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -559,11 +562,24 @@ func (m *QuerySubmittedBlobStatusResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.VotingEndsAt |= uint64(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.VotingEndsAt = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) From dc522b8503a0d68a771f1ead1246a14e7f638229 Mon Sep 17 00:00:00 2001 From: saiteja Date: Fri, 20 Sep 2024 10:31:17 +0530 Subject: [PATCH 2/3] fix: fix test --- keeper/query_server_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keeper/query_server_test.go b/keeper/query_server_test.go index 6e3b8e2..bcb7696 100644 --- a/keeper/query_server_test.go +++ b/keeper/query_server_test.go @@ -17,7 +17,7 @@ func (s *TestSuite) TestSubmitBlobStatus() { "get blobstatus", types.QuerySubmittedBlobStatusRequest{}, 2, - "IN_VOTING", + "", }, } From fb305dd49d77fb1bfbd1c1af67f27f7fc8ee5577 Mon Sep 17 00:00:00 2001 From: saiteja Date: Fri, 20 Sep 2024 10:46:30 +0530 Subject: [PATCH 3/3] chore: review changes --- keeper/store.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keeper/store.go b/keeper/store.go index 7f4d1da..425b322 100644 --- a/keeper/store.go +++ b/keeper/store.go @@ -17,8 +17,8 @@ const ( FailureState uint32 = 3 ) -func ParseStatus(status uint32, start, end uint64) string { - if start == 0 && end == 0 { +func ParseStatus(status uint32, startHeight, endHeight uint64) string { + if startHeight == 0 && endHeight == 0 { return "" }