Repository: celestiaorg/celestia-node
Pull request #1617 (2023-01-19 01:57:18)

chore!: bump celestia app v0.12.0-rc2
## Overview

bumps to celestia-app v0.12.0-rc2. Experiencing some flakeyness locally, so we might need to adjust a few things. Also, I'm not sure if we should merge this to main since its a release candidate.

We changed PayForData to PayForBlob, but only changed the bare minimum and and any function names, so we still will likely want to do that.

## Checklist

- [x] New and updated code has appropriate documentation
- [x] New and updated code has new and/or updated testing
- [x] Required CI checks are passing
- [x] Visual proof for any user facing features like CLI or documentation updates
- [x] Linked issues closed with keywords


codecov-commenter: # [Codecov](https://codecov.io/gh/celestiaorg/celestia-node/pull/1617?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=celestiaorg) Report
> Merging [#1617](https://codecov.io/gh/celestiaorg/celestia-node/pull/1617?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=celestiaorg) (e29862b) into [main](https://codecov.io/gh/celestiaorg/celestia-node/commit/bb3e7a38694049efa9ec34e13857e41db5050742?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=celestiaorg) (bb3e7a3) will **increase** coverage by `0.22%`.
> The diff coverage is `64.10%`.

```diff
@@            Coverage Diff             @@
##             main    #1617      +/-   ##
==========================================
+ Coverage   53.96%   54.19%   +0.22%     
==========================================
  Files         222      222              
  Lines       14361    14430      +69     
==========================================
+ Hits         7750     7820      +70     
+ Misses       5753     5751       -2     
- Partials      858      859       +1     
```


| [Impacted Files](https://codecov.io/gh/celestiaorg/celestia-node/pull/1617?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=celestiaorg) | Coverage Δ | |
|---|---|---|
| [api/gateway/share.go](https://codecov.io/gh/celestiaorg/celestia-node/pull/1617?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=celestiaorg#diff-YXBpL2dhdGV3YXkvc2hhcmUuZ28=) | `0.00% <0.00%> (ø)` | |
| [header/store/store.go](https://codecov.io/gh/celestiaorg/celestia-node/pull/1617?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=celestiaorg#diff-aGVhZGVyL3N0b3JlL3N0b3JlLmdv) | `62.26% <ø> (ø)` | |
| [nodebuilder/state/core.go](https://codecov.io/gh/celestiaorg/celestia-node/pull/1617?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=celestiaorg#diff-bm9kZWJ1aWxkZXIvc3RhdGUvY29yZS5nbw==) | `100.00% <ø> (ø)` | |
| [nodebuilder/state/keyring.go](https://codecov.io/gh/celestiaorg/celestia-node/pull/1617?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=celestiaorg#diff-bm9kZWJ1aWxkZXIvc3RhdGUva2V5cmluZy5nbw==) | `0.00% <ø> (ø)` | |
| [nodebuilder/state/opts.go](https://codecov.io/gh/celestiaorg/celestia-node/pull/1617?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=celestiaorg#diff-bm9kZWJ1aWxkZXIvc3RhdGUvb3B0cy5nbw==) | `100.00% <ø> (ø)` | |
| [nodebuilder/testing.go](https://codecov.io/gh/celestiaorg/celestia-node/pull/1617?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=celestiaorg#diff-bm9kZWJ1aWxkZXIvdGVzdGluZy5nbw==) | `100.00% <ø> (ø)` | |
| [share/ipld/nmt.go](https://codecov.io/gh/celestiaorg/celestia-node/pull/1617?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=celestiaorg#diff-c2hhcmUvaXBsZC9ubXQuZ28=) | `48.43% <ø> (ø)` | |
| [share/share.go](https://codecov.io/gh/celestiaorg/celestia-node/pull/1617?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=celestiaorg#diff-c2hhcmUvc2hhcmUuZ28=) | `72.72% <ø> (ø)` | |
| [header/p2p/helpers.go](https://codecov.io/gh/celestiaorg/celestia-node/pull/1617?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=celestiaorg#diff-aGVhZGVyL3AycC9oZWxwZXJzLmdv) | `67.39% <25.00%> (+4.34%)` | :arrow_up: |
| [state/core\_access.go](https://codecov.io/gh/celestiaorg/celestia-node/pull/1617?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=celestiaorg#diff-c3RhdGUvY29yZV9hY2Nlc3MuZ28=) | `28.78% <33.33%> (-0.11%)` | :arrow_down: |
| ... and [15 more](https://codecov.io/gh/celestiaorg/celestia-node/pull/1617?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=celestiaorg) | |

Help us with your feedback. Take ten seconds to tell us [how you rate us](https://about.codecov.io/nps?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=celestiaorg). Have a feature suggestion? [Share it here.](https://app.codecov.io/gh/feedback/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=celestiaorg)

evan-forbes: `TestFullReconstructFromBridge` and maybe other swamp tests are flakey locally, so we might need to adjust some things
evan-forbes: will update this to rc2 after we run the tests one last time with rc1+the fix for saving test files
evan-forbes: all grrreeeeeeeeeeeeennnnnnnn :heavy_check_mark: 🟩 ✅✅✅✅✅✅✅✅✅✅

Patch:
diff --git a/api/gateway/share.go b/api/gateway/share.go
index 3046346e..4028e992 100644
--- a/api/gateway/share.go
+++ b/api/gateway/share.go
@@ -112,13 +112,13 @@ func (h *Handler) getShares(ctx context.Context, height uint64, nID namespace.ID
 }
 
 func dataFromShares(shares []share.Share) ([][]byte, error) {
-	messages, err := appshares.ParseMsgs(shares)
+	blobs, err := appshares.ParseBlobs(shares)
 	if err != nil {
 		return nil, err
 	}
-	data := make([][]byte, len(messages.MessagesList))
-	for i := range messages.MessagesList {
-		data[i] = messages.MessagesList[i].Data
+	data := make([][]byte, len(blobs))
+	for i := range blobs {
+		data[i] = blobs[i].Data
 	}
 	return data, nil
 }
diff --git a/go.mod b/go.mod
index 0ced26a5..d5e24022 100644
--- a/go.mod
+++ b/go.mod
@@ -8,11 +8,11 @@ require (
 	cosmossdk.io/math v1.0.0-beta.3
 	github.com/BurntSushi/toml v1.2.1
 	github.com/alecthomas/jsonschema v0.0.0-20200530073317-71f438968921
-	github.com/celestiaorg/celestia-app v0.11.0
+	github.com/celestiaorg/celestia-app v0.12.0-rc2
 	github.com/celestiaorg/go-libp2p-messenger v0.1.0
-	github.com/celestiaorg/nmt v0.11.0
+	github.com/celestiaorg/nmt v0.12.0
 	github.com/celestiaorg/rsmt2d v0.8.0
-	github.com/cosmos/cosmos-sdk v0.46.0
+	github.com/cosmos/cosmos-sdk v0.46.7
 	github.com/cosmos/cosmos-sdk/api v0.1.0
 	github.com/cristalhq/jwt v1.2.0
 	github.com/dgraph-io/badger/v2 v2.2007.4
@@ -51,7 +51,7 @@ require (
 	github.com/multiformats/go-multiaddr v0.8.0
 	github.com/multiformats/go-multihash v0.2.2-0.20221030163302-608669da49b6
 	github.com/open-rpc/meta-schema v0.0.0-20201029221707-1b72ef2ea333
-	github.com/spf13/cobra v1.6.0
+	github.com/spf13/cobra v1.6.1
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.1
 	github.com/tendermint/tendermint v0.35.4
@@ -85,32 +85,33 @@ require (
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 	github.com/StackExchange/wmi v1.2.1 // indirect
 	github.com/Workiva/go-datastructures v1.0.53 // indirect
-	github.com/armon/go-metrics v0.4.0 // indirect
+	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/aws/aws-sdk-go v1.40.45 // indirect
 	github.com/benbjohnson/clock v1.3.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
 	github.com/bgentry/speakeasy v0.1.0 // indirect
 	github.com/btcsuite/btcd v0.22.1 // indirect
-	github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
+	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
 	github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4 // indirect
-	github.com/celestiaorg/quantum-gravity-bridge v1.2.0 // indirect
+	github.com/celestiaorg/quantum-gravity-bridge v1.3.0 // indirect
 	github.com/cenkalti/backoff/v4 v4.1.3 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/chzyer/readline v1.5.0 // indirect
 	github.com/cockroachdb/apd/v2 v2.0.2 // indirect
 	github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect
-	github.com/confio/ics23/go v0.7.0 // indirect
+	github.com/confio/ics23/go v0.9.0 // indirect
 	github.com/containerd/cgroups v1.0.4 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
-	github.com/cosmos/btcutil v1.0.4 // indirect
-	github.com/cosmos/cosmos-proto v1.0.0-alpha7 // indirect
+	github.com/cosmos/btcutil v1.0.5 // indirect
+	github.com/cosmos/cosmos-proto v1.0.0-alpha8 // indirect
 	github.com/cosmos/go-bip39 v1.0.0 // indirect
 	github.com/cosmos/gogoproto v1.4.2 // indirect
 	github.com/cosmos/gorocksdb v1.2.0 // indirect
-	github.com/cosmos/iavl v0.19.0 // indirect
-	github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect
-	github.com/cosmos/ledger-go v0.9.2 // indirect
+	github.com/cosmos/iavl v0.19.4 // indirect
+	github.com/cosmos/ibc-go/v6 v6.1.0 // indirect
+	github.com/cosmos/ledger-cosmos-go v0.12.1 // indirect
 	github.com/creachadair/taskgroup v0.3.2 // indirect
 	github.com/cskr/pubsub v1.0.2 // indirect
 	github.com/danieljoos/wincred v1.1.2 // indirect
@@ -126,11 +127,11 @@ require (
 	github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
 	github.com/elastic/gosigar v0.14.2 // indirect
 	github.com/etclabscore/go-jsonschema-walk v0.0.6 // indirect
-	github.com/ethereum/go-ethereum v1.10.17 // indirect
+	github.com/ethereum/go-ethereum v1.10.26 // indirect
 	github.com/felixge/httpsnoop v1.0.1 // indirect
 	github.com/flynn/noise v1.0.0 // indirect
 	github.com/francoispqt/gojay v1.2.13 // indirect
-	github.com/fsnotify/fsnotify v1.5.4 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/gammazero/deque v0.2.0 // indirect
 	github.com/go-kit/kit v0.12.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
@@ -219,10 +220,11 @@ require (
 	github.com/lucas-clemente/quic-go v0.31.1 // indirect
 	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/mailru/easyjson v0.7.6 // indirect
+	github.com/manifoldco/promptui v0.9.0 // indirect
 	github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
 	github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect
 	github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/mattn/go-pointer v0.0.1 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
@@ -247,7 +249,7 @@ require (
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.5 // indirect
 	github.com/petar/GoLLRB v0.0.0-20210522233825-ae3b015fd3e9 // indirect
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
@@ -259,21 +261,21 @@ require (
 	github.com/prometheus/procfs v0.8.0 // indirect
 	github.com/rakyll/statik v0.1.7 // indirect
 	github.com/raulk/go-watchdog v1.3.0 // indirect
-	github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
+	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/regen-network/cosmos-proto v0.3.1 // indirect
 	github.com/rivo/uniseg v0.4.2 // indirect
 	github.com/rjeczalik/notify v0.9.1 // indirect
 	github.com/rs/cors v1.8.2 // indirect
 	github.com/rs/zerolog v1.27.0 // indirect
-	github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect
+	github.com/sasha-s/go-deadlock v0.3.1 // indirect
 	github.com/shirou/gopsutil v3.21.6+incompatible // indirect
 	github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
-	github.com/spf13/afero v1.8.2 // indirect
+	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/viper v1.12.0 // indirect
-	github.com/subosito/gotenv v1.4.0 // indirect
+	github.com/spf13/viper v1.14.0 // indirect
+	github.com/subosito/gotenv v1.4.1 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
 	github.com/tendermint/btcd v0.1.1 // indirect
 	github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect
@@ -287,7 +289,8 @@ require (
 	github.com/whyrusleeping/cbor-gen v0.0.0-20200123233031-1cdf64d27158 // indirect
 	github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
 	github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee // indirect
-	github.com/zondax/hid v0.9.1-0.20220302062450-5552068d2266 // indirect
+	github.com/zondax/hid v0.9.1 // indirect
+	github.com/zondax/ledger-go v0.14.0 // indirect
 	go.etcd.io/bbolt v1.3.6 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
@@ -308,8 +311,8 @@ require (
 	google.golang.org/api v0.102.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
-	gopkg.in/ini.v1 v1.66.6 // indirect
+	google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -319,8 +322,8 @@ require (
 )
 
 replace (
-	github.com/cosmos/cosmos-sdk => github.com/celestiaorg/cosmos-sdk v1.4.0-sdk-v0.46.0
+	github.com/cosmos/cosmos-sdk => github.com/celestiaorg/cosmos-sdk v1.5.1-sdk-v0.46.6
 	github.com/filecoin-project/dagstore => github.com/celestiaorg/dagstore v0.0.0-20221014072825-395797efb659
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
-	github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.5.0-tm-v0.34.20-verify-key-patch
+	github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.13.0-tm-v0.34.23
 )
diff --git a/go.sum b/go.sum
index 366be3b6..31628a00 100644
--- a/go.sum
+++ b/go.sum
@@ -93,7 +93,7 @@ github.com/Kubuxu/go-os-helper v0.0.1/go.mod h1:N8B+I7vPCT80IcP58r50u4+gEEcsZETF
 github.com/Masterminds/glide v0.13.2/go.mod h1:STyF5vcenH/rUqTEv+/hBXlSTo7KYwg2oc2f4tzPWic=
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/vcs v1.13.0/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA=
-github.com/Microsoft/go-winio v0.5.0 h1:Elr9Wn+sGKPlkaBvwu4mTrxtmOp3F3yV9qhaHbXGjwU=
+github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg=
 github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw=
 github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
@@ -114,7 +114,7 @@ github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/
 github.com/Workiva/go-datastructures v1.0.53 h1:J6Y/52yX10Xc5JjXmGtWoSSxs3mZnGSaq37xZZh7Yig=
 github.com/Workiva/go-datastructures v1.0.53/go.mod h1:1yZL+zfsztete+ePzZz/Zb1/t5BnDuE2Ya2MMGhzP6A=
 github.com/Zilliqa/gozilliqa-sdk v1.2.1-0.20201201074141-dd0ecada1be6/go.mod h1:eSYp2T6f0apnuW8TzhV3f6Aff2SE8Dwio++U4ha4yEM=
-github.com/adlio/schema v1.1.13 h1:LeNMVg5Z1FX+Qgz8tJUijBLRdcpbFUElz+d1489On98=
+github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
@@ -135,8 +135,8 @@ github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-metrics v0.4.0 h1:yCQqn7dwca4ITXb+CbubHmedzaQYHhNhrEXLYUeEe8Q=
-github.com/armon/go-metrics v0.4.0/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
+github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
+github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A=
 github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
@@ -168,7 +168,6 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
 github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
-github.com/btcsuite/btcd v0.0.0-20190115013929-ed77733ec07d/go.mod h1:d3C0AkH6BRcvO8T0UEPu53cnw4IbV63x1bEjildYhO0=
 github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8=
 github.com/btcsuite/btcd v0.0.0-20190315201642-aa6e0f35703c/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8=
 github.com/btcsuite/btcd v0.0.0-20190523000118-16327141da8c/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI=
@@ -180,13 +179,12 @@ github.com/btcsuite/btcd v0.22.0-beta/go.mod h1:9n5ntfhhHQBIhUvlhDvD3Qg6fRUj4jkN
 github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c=
 github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y=
 github.com/btcsuite/btcd/btcec/v2 v2.1.2/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
-github.com/btcsuite/btcd/btcec/v2 v2.2.0 h1:fzn1qaOt32TuLjFlkzYSsBC35Q3KUjT1SwPxiMSCF5k=
-github.com/btcsuite/btcd/btcec/v2 v2.2.0/go.mod h1:U7MHm051Al6XmscBQ0BoNydpOTsFAn707034b5nY8zU=
+github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U=
+github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/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-20180706230648-ab6388e0c60a/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
 github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
 github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
 github.com/btcsuite/btcutil v1.0.2/go.mod h1:j9HUFwoQRsZL3V4n+qG+CUnEGHOarIxfC3Le2Yhbcts=
@@ -203,12 +201,12 @@ github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7
 github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
 github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34=
 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
-github.com/celestiaorg/celestia-app v0.11.0 h1:F76mBdLJZ1LLjWEPVEjoFPJA4skaY7Wrg+5o1LVlHGY=
-github.com/celestiaorg/celestia-app v0.11.0/go.mod h1:6k/zcNDEgOyJRGnAgWw1VsrwTKcVjOyYG5LPTHcZR+w=
-github.com/celestiaorg/celestia-core v1.5.0-tm-v0.34.20-verify-key-patch h1:b0swFbc0JqivwVz1UwnzFPlXYsVFkoHAmJ3LIfP4/2o=
-github.com/celestiaorg/celestia-core v1.5.0-tm-v0.34.20-verify-key-patch/go.mod h1:f4R8qNJrP1CDH0SNwj4jA3NymBLQM4lNdx6Ijmfllbw=
-github.com/celestiaorg/cosmos-sdk v1.4.0-sdk-v0.46.0 h1:65gnQ92mfz+9XNVTHeVwMp+SZuBqmToEnz8+WdDRmQ8=
-github.com/celestiaorg/cosmos-sdk v1.4.0-sdk-v0.46.0/go.mod h1:ByQ2rOrZs7s2OnPfeaiTMC8IOlcrT195xIRPgevydCI=
+github.com/celestiaorg/celestia-app v0.12.0-rc2 h1:eRusc/XPPTq0NC5Nes186XbidilSuT7Sv506IMdHVmM=
+github.com/celestiaorg/celestia-app v0.12.0-rc2/go.mod h1:1VLYgvVX7GQ4OD+NoymwzCEqjNdm9woG06hDx2tKA2E=
+github.com/celestiaorg/celestia-core v1.13.0-tm-v0.34.23 h1:nMg928RIanyA2ICN3PHpIE6jgg+008BtD5XmxeObEhM=
+github.com/celestiaorg/celestia-core v1.13.0-tm-v0.34.23/go.mod h1:Iu2XuSzF+QG3rzd60/sGhhk3n4wOAm8YyadU80KlcMs=
+github.com/celestiaorg/cosmos-sdk v1.5.1-sdk-v0.46.6 h1:G7c1qcM2WTVdiLsyHASyP4pOK7D4QsOrbXl0qP3GKpk=
+github.com/celestiaorg/cosmos-sdk v1.5.1-sdk-v0.46.6/go.mod h1:2Oq+pYLgUOdcv++AXR77Nv/Yiw4dckswSQN1iyScUqk=
 github.com/celestiaorg/dagstore v0.0.0-20221014072825-395797efb659 h1:f3205vw3GYBtMiNoS+qB6IuHSs50Iwqsm9lNIikLTCk=
 github.com/celestiaorg/dagstore v0.0.0-20221014072825-395797efb659/go.mod h1:ta/DlqIH10bvhwqJIw51Nq3QU4XVMp6pz3f0Deve9fM=
 github.com/celestiaorg/go-libp2p-messenger v0.1.0 h1:rFldTa3ZWcRRn8E2bRWS94Qp1GFYXO2a0uvqpIey1B8=
@@ -217,10 +215,10 @@ github.com/celestiaorg/go-verifcid v0.0.1-lazypatch h1:9TSe3w1cmJmbWlweCwCTIZkan
 github.com/celestiaorg/go-verifcid v0.0.1-lazypatch/go.mod h1:kXPYu0XqTNUKWA1h3M95UHjUqBzDwXVVt/RXZDjKJmQ=
 github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4 h1:CJdIpo8n5MFP2MwK0gSRcOVlDlFdQJO1p+FqdxYzmvc=
 github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4/go.mod h1:fzuHnhzj1pUygGz+1ZkB3uQbEUL4htqCGJ4Qs2LwMZA=
-github.com/celestiaorg/nmt v0.11.0 h1:iqTaNwnVzM3njBmPklpHzb3A4Xy/JKahoclRPbAzxNc=
-github.com/celestiaorg/nmt v0.11.0/go.mod h1:NN3W8EEoospv8EHCw50DDNWwPLpJkFHoEFiqCEcNCH4=
-github.com/celestiaorg/quantum-gravity-bridge v1.2.0 h1:l/LEEUP+x8MhhXB8rrWkyUVFZgQj1Ur/TAwUpnyLK38=
-github.com/celestiaorg/quantum-gravity-bridge v1.2.0/go.mod h1:6WOajINTDEUXpSj5UZzod16UZ96ZVB/rFNKyM+Mt1gI=
+github.com/celestiaorg/nmt v0.12.0 h1:6CmaMPri9FdSiytZP7yCrEq3ewebFiIEjlJhasrS6oQ=
+github.com/celestiaorg/nmt v0.12.0/go.mod h1:NN3W8EEoospv8EHCw50DDNWwPLpJkFHoEFiqCEcNCH4=
+github.com/celestiaorg/quantum-gravity-bridge v1.3.0 h1:9zPIp7w1FWfkPnn16y3S4FpFLnQtS7rm81CUVcHEts0=
+github.com/celestiaorg/quantum-gravity-bridge v1.3.0/go.mod h1:6WOajINTDEUXpSj5UZzod16UZ96ZVB/rFNKyM+Mt1gI=
 github.com/celestiaorg/rsmt2d v0.8.0 h1:ZUxTCELZCM9zMGKNF3cT+rUqMddXMeiuyleSJPZ3Wn4=
 github.com/celestiaorg/rsmt2d v0.8.0/go.mod h1:hhlsTi6G3+X5jOP/8Lb/d7i5y2XNFmnyMddYbFSmrgo=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
@@ -240,8 +238,14 @@ github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
 github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
 github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/logex v1.2.0 h1:+eqR0HfOetur4tgnC8ftU5imRnhi4te+BadWS95c5AM=
+github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/readline v1.5.0 h1:lSwwFrbNviGePhkewF1az4oLmcwqCZijQ2/Wi3BGHAI=
+github.com/chzyer/readline v1.5.0/go.mod h1:x22KAscuvRqlLoK9CsoYsmxoXZMMFVyOl86cAH8qUic=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/chzyer/test v0.0.0-20210722231415-061457976a23 h1:dZ0/VyGgQdVGAss6Ju0dt5P0QltE0SFY5Woh6hbIfiQ=
+github.com/chzyer/test v0.0.0-20210722231415-061457976a23/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs=
 github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
@@ -264,8 +268,8 @@ github.com/codegangsta/cli v1.20.0/go.mod h1:/qJNoX69yVSKu5o4jLyXAENLRyk1uhi7zkb
 github.com/coinbase/kryptology v1.8.0/go.mod h1:RYXOAPdzOGUe3qlSFkMGn58i3xUA8hmxYHksuq+8ciI=
 github.com/coinbase/rosetta-sdk-go v0.7.9 h1:lqllBjMnazTjIqYrOGv8h8jxjg9+hJazIGZr9ZvoCcA=
 github.com/coinbase/rosetta-sdk-go v0.7.9/go.mod h1:0/knutI7XGVqXmmH4OQD8OckFrbQ8yMsUZTG7FXCR2M=
-github.com/confio/ics23/go v0.7.0 h1:00d2kukk7sPoHWL4zZBZwzxnpA2pec1NPdwbSokJ5w8=
-github.com/confio/ics23/go v0.7.0/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg=
+github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4=
+github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak=
 github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ=
 github.com/consensys/bavard v0.1.8-0.20210915155054-088da2f7f54a/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI=
 github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q=
@@ -273,7 +277,7 @@ github.com/consensys/gnark-crypto v0.5.3/go.mod h1:hOdPlWQV1gDLp7faZVeg8Y0iEPFaO
 github.com/containerd/cgroups v0.0.0-20201119153540-4cbc285b3327/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE=
 github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA=
 github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA=
-github.com/containerd/continuity v0.1.0 h1:UFRRY5JemiAhPZrr/uE0n8fMTLcZsUvySPr1+D7pgr8=
+github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@@ -287,10 +291,10 @@ github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/corpix/uarand v0.1.1/go.mod h1:SFKZvkcRoLqVRFZ4u25xPmp6m9ktANfbpXZ7SJ0/FNU=
-github.com/cosmos/btcutil v1.0.4 h1:n7C2ngKXo7UC9gNyMNLbzqz7Asuf+7Qv4gnX/rOdQ44=
-github.com/cosmos/btcutil v1.0.4/go.mod h1:Ffqc8Hn6TJUdDgHBwIZLtrLQC1KdJ9jGJl/TvgUaxbU=
-github.com/cosmos/cosmos-proto v1.0.0-alpha7 h1:yqYUOHF2jopwZh4dVQp3xgqwftE5/2hkrwIV6vkUbO0=
-github.com/cosmos/cosmos-proto v1.0.0-alpha7/go.mod h1:dosO4pSAbJF8zWCzCoTWP7nNsjcvSUBQmniFxDg5daw=
+github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk=
+github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis=
+github.com/cosmos/cosmos-proto v1.0.0-alpha8 h1:d3pCRuMYYvGA5bM0ZbbjKn+AoQD4A7dyNG2wzwWalUw=
+github.com/cosmos/cosmos-proto v1.0.0-alpha8/go.mod h1:6/p+Bc4O8JKeZqe0VqUGTX31eoYqemTT4C1hLCWsO7I=
 github.com/cosmos/cosmos-sdk/api v0.1.0 h1:xfSKM0e9p+EJTMQnf5PbWE6VT8ruxTABIJ64Rd064dE=
 github.com/cosmos/cosmos-sdk/api v0.1.0/go.mod h1:CupqQBskAOiTXO1XDZ/wrtWzN/wTxUvbQmOqdUhR8wI=
 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
@@ -300,12 +304,12 @@ github.com/cosmos/gogoproto v1.4.2 h1:UeGRcmFW41l0G0MiefWhkPEVEwvu78SZsHBvI78dAY
 github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU=
 github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y=
 github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw=
-github.com/cosmos/iavl v0.19.0 h1:sgyrjqOkycXiN7Tuupuo4QAldKFg7Sipyfeg/IL7cps=
-github.com/cosmos/iavl v0.19.0/go.mod h1:l5h9pAB3m5fihB3pXVgwYqdY8aBsMagqz7T0MUjxZeA=
-github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4=
-github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY=
-github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI=
-github.com/cosmos/ledger-go v0.9.2/go.mod h1:oZJ2hHAZROdlHiwTg4t7kP+GKIIkBT+o6c9QWFanOyI=
+github.com/cosmos/iavl v0.19.4 h1:t82sN+Y0WeqxDLJRSpNd8YFX5URIrT+p8n6oJbJ2Dok=
+github.com/cosmos/iavl v0.19.4/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw=
+github.com/cosmos/ibc-go/v6 v6.1.0 h1:o7oXws2vKkKfOFzJI+oNylRn44PCNt5wzHd/zKQKbvQ=
+github.com/cosmos/ibc-go/v6 v6.1.0/go.mod h1:CY3zh2HLfetRiW8LY6kVHMATe90Wj/UOoY8T6cuB0is=
+github.com/cosmos/ledger-cosmos-go v0.12.1 h1:sMBxza5p/rNK/06nBSNmsI/WDqI0pVJFVNihy1Y984w=
+github.com/cosmos/ledger-cosmos-go v0.12.1/go.mod h1:dhO6kj+Y+AHIOgAe4L9HL/6NDdyyth4q238I9yFpD2g=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
@@ -399,8 +403,9 @@ github.com/etclabscore/go-jsonschema-walk v0.0.6 h1:DrNzoKWKd8f8XB5nFGBY00IcjakR
 github.com/etclabscore/go-jsonschema-walk v0.0.6/go.mod h1:VdfDY72AFAiUhy0ZXEaWSpveGjMT5JcDIm903NGqFwQ=
 github.com/etclabscore/go-openrpc-reflect v0.0.37 h1:IH0e7JqIvR9OhbbFWi/BHIkXrqbR3Zyia3RJ733eT6c=
 github.com/etclabscore/go-openrpc-reflect v0.0.37/go.mod h1:0404Ky3igAasAOpyj1eESjstTyneBAIk5PgJFbK4s5E=
-github.com/ethereum/go-ethereum v1.10.17 h1:XEcumY+qSr1cZQaWsQs5Kck3FHB0V2RiMHPdTBJ+oT8=
 github.com/ethereum/go-ethereum v1.10.17/go.mod h1:Lt5WzjM07XlXc95YzrhosmR4J9Ahd6X2wyEV2SvGhk0=
+github.com/ethereum/go-ethereum v1.10.26 h1:i/7d9RBBwiXCEuyduBQzJw/mKmnvzsN14jqBmytw72s=
+github.com/ethereum/go-ethereum v1.10.26/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg=
 github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0=
 github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A=
 github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk=
@@ -427,8 +432,8 @@ github.com/frankban/quicktest v1.14.2/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUork
 github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
-github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
+github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
+github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 github.com/gammazero/deque v0.2.0 h1:SkieyNB4bg2/uZZLxvya0Pq6diUlwx7m2TeT7GAIWaA=
 github.com/gammazero/deque v0.2.0/go.mod h1:LFroj8x4cMYCukHJDbxFCkT+r9AndaJnFMuZDV34tuU=
 github.com/gammazero/workerpool v1.1.3 h1:WixN4xzukFoN0XSeXF6puqEqFTl2mECI9S6W44HWy9Q=
@@ -495,8 +500,8 @@ github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8c
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
+github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
 github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
@@ -897,7 +902,7 @@ github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1C
 github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
 github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jhump/protoreflect v1.12.1-0.20220417024638-438db461d753 h1:uFlcJKZPLQd7rmOY/RrvBuUaYmAFnlFHKLivhO6cOy8=
+github.com/jhump/protoreflect v1.12.1-0.20220721211354-060cc04fc18b h1:izTof8BKh/nE1wrKOrloNA5q4odOarjf+Xpe+4qow98=
 github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
@@ -1202,6 +1207,8 @@ github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN
 github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
 github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA=
+github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg=
 github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
 github.com/marten-seemann/qpack v0.3.0 h1:UiWstOgT8+znlkDPOg2+3rIuYXJ2CnGDkGUXN6ki6hE=
 github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs=
@@ -1224,8 +1231,9 @@ github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc
 github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
@@ -1424,8 +1432,8 @@ github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWEr
 github.com/open-rpc/meta-schema v0.0.0-20201029221707-1b72ef2ea333 h1:CznVS40zms0Dj5he4ERo+fRPtO0qxUk8lA8Xu3ddet0=
 github.com/open-rpc/meta-schema v0.0.0-20201029221707-1b72ef2ea333/go.mod h1:Ag6rSXkHIckQmjFBCweJEEt1mrTPBv8b9W4aU/NQWfI=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
-github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
-github.com/opencontainers/runc v1.0.2 h1:opHZMaswlyxz1OuGpBE53Dwe4/xF7EZTY0A2L/FpCOg=
+github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034=
+github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w=
 github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 h1:3snG66yBm59tKhhSPQrQ/0bCrv1LQbKt40LnUPiUxdc=
 github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
@@ -1453,8 +1461,8 @@ github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtP
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pelletier/go-toml/v2 v2.0.2 h1:+jQXlF3scKIcSEKkdHzXhCTDLPFi5r1wnK6yPS+49Gw=
-github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI=
+github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg=
+github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas=
 github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
 github.com/petar/GoLLRB v0.0.0-20210522233825-ae3b015fd3e9 h1:1/WtZae0yGtPq+TI6+Tv1WTxkukpXeMlviSxvL7SRgk=
 github.com/petar/GoLLRB v0.0.0-20210522233825-ae3b015fd3e9/go.mod h1:x3N5drFsm2uilKKuuYo6LdyD8vZAW55sH/9w+pbo1sw=
@@ -1535,8 +1543,8 @@ github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Ung
 github.com/raulk/go-watchdog v1.3.0 h1:oUmdlHxdkXRJlwfG0O9omj8ukerm8MEQavSiDTEtBsk=
 github.com/raulk/go-watchdog v1.3.0/go.mod h1:fIvOnLbF0b0ZwkB9YU4mOW9Did//4vPZtDqv66NfsMU=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 h1:MkV+77GLUNo5oJ0jf870itWm3D0Sjh7+Za9gazKc5LQ=
-github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
+github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
+github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/regen-network/cosmos-proto v0.3.1 h1:rV7iM4SSFAagvy8RiyhiACbWEGotmqzywPxOvwMdxcg=
 github.com/regen-network/cosmos-proto v0.3.1/go.mod h1:jO0sVX6a1B36nmE8C9xBFXpNwWejXC7QqCOnH3O0+YM=
 github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4=
@@ -1564,8 +1572,8 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
-github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa h1:0U2s5loxrTy6/VgfVoLuVLFJcURKLH49ie0zSch7gh4=
-github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM=
+github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0=
+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/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY=
 github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo=
@@ -1601,8 +1609,8 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod h1:2RVY1rIf+2J2o/IM9+vPq9RzmHDSseB7FoXiSNIUsoU=
@@ -1620,15 +1628,15 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
-github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
-github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
+github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
+github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
 github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
-github.com/spf13/cobra v1.6.0 h1:42a0n6jwCot1pUmomAp4T7DeMD+20LFv4Q54pxLf2LI=
-github.com/spf13/cobra v1.6.0/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
+github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
+github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
@@ -1637,8 +1645,8 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
-github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ=
-github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI=
+github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU=
+github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As=
 github.com/src-d/envconfig v1.0.0/go.mod h1:Q9YQZ7BKITldTBnoxsE5gOeB5y66RyPXeue/R4aaNBc=
 github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q=
 github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
@@ -1658,12 +1666,11 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/subosito/gotenv v1.4.0 h1:yAzM1+SmVcz5R4tXGsNMu1jUl2aOJXoiWUCEwwnGrvs=
-github.com/subosito/gotenv v1.4.0/go.mod h1:mZd6rFysKEcUhUHXJk0C/08wAgyDBFuwEYL7vWWGaGo=
+github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs=
+github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
@@ -1750,9 +1757,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM=
-github.com/zondax/hid v0.9.1-0.20220302062450-5552068d2266 h1:O9XLFXGkVswDFmH9LaYpqu+r/AAFWqr0DL6V00KEVFg=
-github.com/zondax/hid v0.9.1-0.20220302062450-5552068d2266/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM=
+github.com/zondax/hid v0.9.1 h1:gQe66rtmyZ8VeGFcOpbuH3r7erYtNEAezCAYu8LdkJo=
+github.com/zondax/hid v0.9.1/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM=
+github.com/zondax/ledger-go v0.14.0 h1:dlMC7aO8Wss1CxBq2I96kZ69Nh1ligzbs8UWOtq/AsA=
+github.com/zondax/ledger-go v0.14.0/go.mod h1:fZ3Dqg6qcdXWSOJFKMG8GCTnD7slO/RL2feOQv8K320=
 gitlab.com/NebulousLabs/errors v0.0.0-20171229012116-7ead97ef90b8/go.mod h1:ZkMZ0dpQyWwlENaeZVBiQRjhMEZvk6VTXquzl3FOFP8=
 gitlab.com/NebulousLabs/errors v0.0.0-20200929122200-06c536cf6975 h1:L/ENs/Ar1bFzUeKx6m3XjlmBgIUlykX9dzvp5k9NGxc=
 gitlab.com/NebulousLabs/fastrand v0.0.0-20181126182046-603482d69e40 h1:dizWJqTWjwyD8KGcMOwgrkqu1JIkofYgKkmDeNE7oAs=
@@ -2127,10 +2135,11 @@ golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
 golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
@@ -2366,8 +2375,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8 h1:KR8+MyP7/qOlV+8Af01LtjL04bu7on42eVsxT4EyBQk=
+google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -2381,8 +2390,8 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/ini.v1 v1.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI=
-gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+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/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns=
@@ -2423,8 +2432,7 @@ lukechampine.com/blake3 v1.1.7 h1:GgRMhmdsuK8+ii6UZFDL8Nb+VyMwadAgcJyfYHxG6n0=
 lukechampine.com/blake3 v1.1.7/go.mod h1:tkKEOtDkNtklkXtLNEOGNq5tcV90tJiA1vAA12R78LA=
 nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k=
 nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
-pgregory.net/rapid v0.4.7 h1:MTNRktPuv5FNqOO151TM9mDTa+XHcX6ypYeISDVD14g=
-pgregory.net/rapid v0.4.7/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU=
+pgregory.net/rapid v0.5.3 h1:163N50IHFqr1phZens4FQOdPgfJscR7a562mjQqeo4M=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
diff --git a/nodebuilder/state/core.go b/nodebuilder/state/core.go
index 069cb076..d617f621 100644
--- a/nodebuilder/state/core.go
+++ b/nodebuilder/state/core.go
@@ -1,7 +1,7 @@
 package state
 
 import (
-	apptypes "github.com/celestiaorg/celestia-app/x/payment/types"
+	apptypes "github.com/celestiaorg/celestia-app/x/blob/types"
 	"github.com/celestiaorg/celestia-node/header"
 	"github.com/celestiaorg/celestia-node/libs/header/sync"
 	"github.com/celestiaorg/celestia-node/nodebuilder/core"
diff --git a/nodebuilder/state/keyring.go b/nodebuilder/state/keyring.go
index 1c4ff9b1..e5347aca 100644
--- a/nodebuilder/state/keyring.go
+++ b/nodebuilder/state/keyring.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/celestiaorg/celestia-app/app"
 	"github.com/celestiaorg/celestia-app/app/encoding"
-	apptypes "github.com/celestiaorg/celestia-app/x/payment/types"
+	apptypes "github.com/celestiaorg/celestia-app/x/blob/types"
 
 	"github.com/celestiaorg/celestia-node/libs/keystore"
 	"github.com/celestiaorg/celestia-node/nodebuilder/p2p"
diff --git a/nodebuilder/state/opts.go b/nodebuilder/state/opts.go
index b159f95d..0b357b83 100644
--- a/nodebuilder/state/opts.go
+++ b/nodebuilder/state/opts.go
@@ -3,7 +3,7 @@ package state
 import (
 	"go.uber.org/fx"
 
-	"github.com/celestiaorg/celestia-app/x/payment/types"
+	"github.com/celestiaorg/celestia-app/x/blob/types"
 )
 
 // WithKeyringSigner overrides the default keyring signer constructed
diff --git a/share/empty.go b/share/empty.go
index c6707b32..5fee787d 100644
--- a/share/empty.go
+++ b/share/empty.go
@@ -24,7 +24,7 @@ func EnsureEmptySquareExists(ctx context.Context, bServ blockservice.BlockServic
 // EmptyExtendedDataSquare returns the EDS of the empty block data square.
 func EmptyExtendedDataSquare() *rsmt2d.ExtendedDataSquare {
 	shares := emptyDataSquare()
-	squareSize := uint64(math.Sqrt(float64(appconsts.MinSquareSize)))
+	squareSize := uint64(math.Sqrt(float64(appconsts.DefaultMinSquareSize)))
 	eds, err := da.ExtendShares(squareSize, shares)
 	if err != nil {
 		panic(fmt.Errorf("failed to create empty EDS: %w", err))
diff --git a/share/ipld/nmt.go b/share/ipld/nmt.go
index 6124e5b9..3f6384ac 100644
--- a/share/ipld/nmt.go
+++ b/share/ipld/nmt.go
@@ -37,7 +37,7 @@ const (
 
 	// MaxSquareSize is currently the maximum size supported for unerasured data in
 	// rsmt2d.ExtendedDataSquare.
-	MaxSquareSize = appconsts.MaxSquareSize
+	MaxSquareSize = appconsts.DefaultMaxSquareSize
 
 	// NamespaceSize is a system-wide size for NMT namespaces.
 	NamespaceSize = appconsts.NamespaceSize
diff --git a/share/share.go b/share/share.go
index 8fbf427a..66d2c0df 100644
--- a/share/share.go
+++ b/share/share.go
@@ -19,7 +19,7 @@ var (
 const (
 	// MaxSquareSize is currently the maximum size supported for unerasured data in
 	// rsmt2d.ExtendedDataSquare.
-	MaxSquareSize = appconsts.MaxSquareSize
+	MaxSquareSize = appconsts.DefaultMaxSquareSize
 	// NamespaceSize is a system-wide size for NMT namespaces.
 	NamespaceSize = appconsts.NamespaceSize
 	// Size is a system-wide size of a share, including both data and namespace ID
diff --git a/state/core_access.go b/state/core_access.go
index 73c75d2f..596c3ab7 100644
--- a/state/core_access.go
+++ b/state/core_access.go
@@ -20,8 +20,9 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 
 	"github.com/celestiaorg/celestia-app/app"
-	"github.com/celestiaorg/celestia-app/x/payment"
-	apptypes "github.com/celestiaorg/celestia-app/x/payment/types"
+	"github.com/celestiaorg/celestia-app/pkg/appconsts"
+	"github.com/celestiaorg/celestia-app/x/blob"
+	apptypes "github.com/celestiaorg/celestia-app/x/blob/types"
 	"github.com/celestiaorg/nmt/namespace"
 
 	"github.com/celestiaorg/celestia-node/header"
@@ -162,8 +163,16 @@ func (ca *CoreAccessor) SubmitPayForBlob(
 	fee Int,
 	gasLim uint64,
 ) (*TxResponse, error) {
-	response, err := payment.SubmitPayForData(ctx, ca.signer, ca.coreConn, nID, data, gasLim, withFee(fee))
-	// metrics should only be counted on a successful PFB tx
+	b := &apptypes.Blob{NamespaceId: nID, Data: data, ShareVersion: uint32(appconsts.DefaultShareVersion)}
+	response, err := blob.SubmitPayForBlob(
+		ctx,
+		ca.signer,
+		ca.coreConn,
+		[]*apptypes.Blob{b},
+		apptypes.SetGasLimit(gasLim),
+		withFee(fee),
+	)
+	// metrics should only be counted on a successful PFD tx
 	if err == nil && response.Code == 0 {
 		ca.lastPayForBlob = time.Now().UnixMilli()
 		ca.payForBlobCount++
@@ -231,7 +240,7 @@ func (ca *CoreAccessor) BalanceForAddress(ctx context.Context, addr Address) (*B
 		return nil, fmt.Errorf("cannot convert %s into sdktypes.Int", string(value))
 	}
 	// verify balance
-	err = ca.prt.VerifyValueKeys(
+	err = ca.prt.VerifyValueFromKeys(
 		result.Response.GetProofOps(),
 		head.AppHash,
 		[][]byte{[]byte(banktypes.StoreKey),


Test patch:
diff --git a/core/testing.go b/core/testing.go
index 7b84621c..726dfea4 100644
--- a/core/testing.go
+++ b/core/testing.go
@@ -72,12 +72,16 @@ func StartTestNode(t *testing.T) testnode.Context {
 
 // StartTestNodeWithConfig starts Tendermint and Celestia App tandem with custom configuration.
 func StartTestNodeWithConfig(t *testing.T, cfg *TestConfig) testnode.Context {
+	state, kr, err := testnode.DefaultGenesisState(cfg.Accounts...)
+	require.NoError(t, err)
+
 	tmNode, app, cctx, err := testnode.New(
 		t,
 		cfg.ConsensusParams,
 		cfg.Tendermint,
 		cfg.SuppressLogs,
-		cfg.Accounts...,
+		state,
+		kr,
 	)
 	require.NoError(t, err)
 
diff --git a/nodebuilder/testing.go b/nodebuilder/testing.go
index c478191f..f0dac2c9 100644
--- a/nodebuilder/testing.go
+++ b/nodebuilder/testing.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/celestiaorg/celestia-app/app"
 	"github.com/celestiaorg/celestia-app/app/encoding"
-	apptypes "github.com/celestiaorg/celestia-app/x/payment/types"
+	apptypes "github.com/celestiaorg/celestia-app/x/blob/types"
 
 	"github.com/celestiaorg/celestia-node/core"
 	coreheader "github.com/celestiaorg/celestia-node/header"
diff --git a/nodebuilder/tests/swamp/config.go b/nodebuilder/tests/swamp/config.go
index 11cfed06..2c998b73 100644
--- a/nodebuilder/tests/swamp/config.go
+++ b/nodebuilder/tests/swamp/config.go
@@ -15,7 +15,8 @@ type Components struct {
 // 100ms
 func DefaultComponents() *Components {
 	cfg := core.DefaultTestConfig()
-	cfg.Tendermint.Consensus.TimeoutCommit = 100 * time.Millisecond
+	// timeout commits faster than this tend to be flakier
+	cfg.Tendermint.Consensus.TimeoutCommit = 200 * time.Millisecond
 	return &Components{
 		cfg,
 	}
diff --git a/share/availability/light/availability_test.go b/share/availability/light/availability_test.go
index 1fe77bf0..7918464a 100644
--- a/share/availability/light/availability_test.go
+++ b/share/availability/light/availability_test.go
@@ -14,6 +14,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/tendermint/tendermint/libs/rand"
+	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 	core "github.com/tendermint/tendermint/types"
 
 	"github.com/celestiaorg/celestia-app/pkg/da"
@@ -171,8 +172,11 @@ func TestSharesRoundTrip(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	var b core.Block
-	err := json.Unmarshal([]byte(sampleBlock), &b)
+	var pb tmproto.Block
+	err := json.Unmarshal([]byte(sampleBlock), &pb)
+	require.NoError(t, err)
+
+	b, err := core.BlockFromProto(&pb)
 	require.NoError(t, err)
 
 	namespace, err := hex.DecodeString("00001337BEEF0000")
@@ -191,7 +195,7 @@ func TestSharesRoundTrip(t *testing.T) {
 	cases := []testCase{
 		{
 			"original test case",
-			[][]byte{b.Data.Messages.MessagesList[0].Data},
+			[][]byte{b.Data.Blobs[0].Data},
 			[][]byte{namespace}},
 		{
 			"one short message",
@@ -266,12 +270,12 @@ func TestSharesRoundTrip(t *testing.T) {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			// prepare data
-			b.Data.Messages.MessagesList = make([]core.Message, len(tc.messages))
-			b.OriginalSquareSize = 16
+			b.Data.Blobs = make([]core.Blob, len(tc.messages))
+			b.SquareSize = 16
 			var msgsInNamespace [][]byte
 			require.Equal(t, len(tc.namespaces), len(tc.messages))
 			for i := range tc.messages {
-				b.Data.Messages.MessagesList[i] = core.Message{NamespaceID: tc.namespaces[i], Data: tc.messages[i]}
+				b.Data.Blobs[i] = core.Blob{NamespaceID: tc.namespaces[i], Data: tc.messages[i]}
 				if bytes.Equal(tc.namespaces[i], namespace) {
 					msgsInNamespace = append(msgsInNamespace, tc.messages[i])
 				}
@@ -292,11 +296,11 @@ func TestSharesRoundTrip(t *testing.T) {
 						myShares = append(myShares, sh)
 					}
 				}
-				msgs, err := appshares.ParseMsgs(myShares)
+				blobs, err := appshares.ParseBlobs(myShares)
 				require.NoError(t, err)
-				assert.Len(t, msgs.MessagesList, len(msgsInNamespace))
-				for i := range msgs.MessagesList {
-					assert.Equal(t, msgsInNamespace[i], msgs.MessagesList[i].Data)
+				assert.Len(t, blobs, len(msgsInNamespace))
+				for i := range blobs {
+					assert.Equal(t, msgsInNamespace[i], blobs[i].Data)
 				}
 			}
 
@@ -311,19 +315,19 @@ func TestSharesRoundTrip(t *testing.T) {
 				require.NoError(t, shares.Verify(&dah, namespace))
 				require.NotEmpty(t, shares)
 
-				msgs, err := appshares.ParseMsgs(shares.Flatten())
+				blobs, err := appshares.ParseBlobs(shares.Flatten())
 				require.NoError(t, err)
-				assert.Len(t, msgs.MessagesList, len(msgsInNamespace))
-				for i := range msgs.MessagesList {
-					assert.Equal(t, namespace, []byte(msgs.MessagesList[i].NamespaceID))
-					assert.Equal(t, msgsInNamespace[i], msgs.MessagesList[i].Data)
+				assert.Len(t, blobs, len(msgsInNamespace))
+				for i := range blobs {
+					assert.Equal(t, namespace, []byte(blobs[i].NamespaceID))
+					assert.Equal(t, msgsInNamespace[i], blobs[i].Data)
 				}
 			}
 		})
 	}
 }
 
-// this is a sample block from devnet-2 which originally showed the issue with share ordering
+// this is a sample block
 //
-//go:embed "testdata/block-825320.json"
+//go:embed "testdata/sample-block.json"
 var sampleBlock string
diff --git a/share/availability/light/testdata/block-825320.json b/share/availability/light/testdata/block-825320.json
deleted file mode 100644
index f159fdcc..00000000
--- a/share/availability/light/testdata/block-825320.json
+++ /dev/null
@@ -1,659 +0,0 @@
-{
-  "header": {
-    "version": {
-      "block": 11
-    },
-    "chain_id": "devnet-2",
-    "height": 825320,
-    "time": "2022-04-14T07:52:33.890556391Z",
-    "last_block_id": {
-      "hash": "7FA631D8E8DA005132615B5BB9DD715E66ABE18DB3BF4A891242CCF090D629D1",
-      "parts": {
-        "total": 1,
-        "hash": "9C2705130B4D8A9A9FAD64D462944EABC281B5AC36ADBFA6E3A48A7F347DD8C1"
-      }
-    },
-    "last_commit_hash": "00AAFEB5461158D198967E750E108367EE6D0739E69C0AC2F4D102E0F87D2595",
-    "data_hash": "2AE354BAA0A6C75EDAAB7AA9D6FAAF873FD6FF3E0884DD479306EC6C1AAFD796",
-    "validators_hash": "A76865C38C998C200C6056F8B1D08CB4009683B1110ACE85D95B9889A47650ED",
-    "next_validators_hash": "A76865C38C998C200C6056F8B1D08CB4009683B1110ACE85D95B9889A47650ED",
-    "consensus_hash": "048091BC7DDC283F77BFBF91D73C44DA58C3DF8A9CBC867405D8B7F3DAADA22F",
-    "app_hash": "E2DD3E32D66B330B16BCAB389DA17C2B6BC1B082B2B58ED0A90E8197E36A59A6",
-    "last_results_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855",
-    "evidence_hash": "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855",
-    "proposer_address": "2CB2349B8516D69839FE49892B1AF6909D7361A7"
-  },
-  "data": {
-    "txs": [
-      "CpoBCpcBCiMvY29zbW9zLnN0YWtpbmcudjFiZXRhMS5Nc2dEZWxlZ2F0ZRJwCixjZWxlczEycGd2eWRsOHQ0c3o4NjdzYWNwOWRnOHJhNngydmUwa2d5NjZuMhIzY2VsZXN2YWxvcGVyMTJwZ3Z5ZGw4dDRzejg2N3NhY3A5ZGc4cmE2eDJ2ZTBrZGY0Y3l6GgsKBWNlbGVzEgIxNRJaClIKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiECEyDrMs7ZgCs9VLJY95YHFhUQHNNGMVnEvLnA+fgKuY0SBAoCCAEYr5oPEgQQjPwHGkBRV6kkcTFf+tZVGiSYnm/cy18RQ4Hq/k7NU5JQpJjstln/lCCx2mvjzZENdzoLB6e/ojG1tXPGLApLOtsDG071",
-      "CiDfWZrO6VHoRRehPruO7n8G95bt9EZXM1sPzskKRBlPXxKnAgp8CnoKGS9wYXltZW50Lk1zZ1BheUZvck1lc3NhZ2USXQosY2VsZXMxZ2hodmUyaG1hOW03Y3F1YWRtNTdqZzg3emV4Znhla3poc3B4OGcSCAAAEze+7wAAGIAEIiCB+JF+iC6YVjh3tYKgtF2dIkzNlxVCsRaFZWMmBedAqRJlClEKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiEChGDFtCCOMQBEoVo9SwdQtb7tK9RcHFI/S6mrajefVW0SBAoCCAEYjwwSEAoKCgVjZWxlcxIBMRCAiXoaQGaO5xm+sB5eQN69UO01B0dbkHTJvNdyCMfk2VG3O012aK6eRB4/70zgZ00DLQSFpxZYNQwWZC/VuqRLj1a1e+g="
-    ],
-    "intermediate_roots": {
-      "intermediate_roots": null
-    },
-    "evidence": {
-      "evidence": []
-    },
-    "msgs": {
-      "msgs": [
-        {
-          "NamespaceID": "AAATN77vAAA=",
-          "Data": "CvgBCgIICxIIAAATN77vAAAYAyDDpd+SBiogbVQ+9SML4CjY2Mg0LGwm5W0ZoQOumJUIkb0S4PjiNqQyIMKzG0e9Tl6QJUiIGK1WPPZ8blyB6AGq34E9XcvWe/A/OiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABKILUe8T6ZAQKnvyvNP0iFQbQ5uNwqNTmfueick6JOJ0tyUiDjsMRCmPwcFJr79MiZb7kkJ65B5GSbk0yklZkbeFK4VVoUX9WPtt7dVrsuZpPR/svrM19RW8kSABpmCAISIG1UPvUjC+Ao2NjINCxsJuVtGaEDrpiVCJG9EuD44jakGkB78QszY4BV8F393pSze98ORvKUbNAdNaXwSK8HhfFUM30CwXlo9/BrbJVawCExfj7w2S6QmuhUv0S3KQ2Yh5YIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
-        }
-      ]
-    }
-  },
-  "last_commit": {
-    "height": 825319,
-    "round": 0,
-    "block_id": {
-      "hash": "7FA631D8E8DA005132615B5BB9DD715E66ABE18DB3BF4A891242CCF090D629D1",
-      "parts": {
-        "total": 1,
-        "hash": "9C2705130B4D8A9A9FAD64D462944EABC281B5AC36ADBFA6E3A48A7F347DD8C1"
-      }
-    },
-    "signatures": [
-      {
-        "block_id_flag": 2,
-        "validator_address": "87265CC17922E01497F40B701EC9F05373B83467",
-        "timestamp": "2022-04-14T07:52:33.880851041Z",
-        "signature": "iYUZXYv5FuxC/XZIZ2dA9scTIZXz5dCsy7oSDow7r45KqxytygzleZ3u96X66MV48+G7pNAgyEAdSVku8undAQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "D345D62BBD18C301B843DF7C65F10E57AB17BD98",
-        "timestamp": "2022-04-14T07:52:33.882738752Z",
-        "signature": "Fk70wx+AsLxFSJVKH2cUwGgplVgkHmMIY0yoy/WZd+Mmde8mqOrQBNozR2/yvyQvmfcSFl5cEDwgsmoEZxNkAw=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "604377BC74F4F27274825A564761D9875B31AF05",
-        "timestamp": "2022-04-14T07:52:33.906538296Z",
-        "signature": "C/9OpYWM0cILxwpV8j4rWpeq5T95+Wj3Pv9ntbv+zmE5lHFbuTL9IEPXsnNFC3lTO/6AWZDhiiiBFBdXx5RZDw=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "D6084BAB9BCECCA7A82F6D1F019B315A056A990F",
-        "timestamp": "2022-04-14T07:52:33.934987498Z",
-        "signature": "4Wqvf8KEMTd/Gv/xIDTOBvMxFrE3GANF/C3VO+gMM3lKTQPjN4z2bZvO3r3jYpwUm13CjusDPEFferNa2FcDDQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "B80E80B249B9AC1F192DF445A68A1B69D89458C0",
-        "timestamp": "2022-04-14T07:52:33.905001033Z",
-        "signature": "SxM4iUI9+iUnmCzQBepP2uHrka5Qhos7myhcC7MeiHSorWf0gXFGpxV0KGMlShiAIjEqwIr6wMRQHqV6Fkf/BA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "89B63255AE88218533F9727D7CFDA0376A8C9A67",
-        "timestamp": "2022-04-14T07:52:33.954724715Z",
-        "signature": "rZkx1meoaYHHrEa97sNJKibxktE7OSvTxyGC3ojOhDsG/mMPJXvR9QnHTIn9myuEL9+cUuXjnjrEeL6Xl16tDQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "C25C9BA4A8C2D71E6853A1227EBE6B1D7A07B5A7",
-        "timestamp": "2022-04-14T07:52:33.890556391Z",
-        "signature": "b4vt1uR5a9oTsiRsxxIahjc0lWyJ+hzCxVpJQaAU9yah3OFRH7nfLsPOgZVSky+odnArrP/rM6yqPllr2tMzAg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "7635E9087D9875E784581BE236E4DFCBA71CE556",
-        "timestamp": "2022-04-14T07:52:33.92779807Z",
-        "signature": "I4Hfeufh+xNMwiOhjxds+tJ5E+s1UCnnvTq/rNC4oko3qbGci4xQsLNer/bpf3P1Fd2uHHYq9kE+M/9yv0TgCA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "2CB2349B8516D69839FE49892B1AF6909D7361A7",
-        "timestamp": "2022-04-14T07:52:33.871894353Z",
-        "signature": "yppE7QcDrRB2ejnUURnS5I1GZJlO9GaChSeKIkLiAz8X1Rmmd3HTtRGJyc1a0/V2xMOu/ChYjQRBSVXB8ThKBQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "DEC2642E786A941511A401090D21621E7F08A36D",
-        "timestamp": "2022-04-14T07:52:33.895698256Z",
-        "signature": "f+6qaGhh8qLW+DjEfIc8w0yoFjgxQkWL/BVU1z/YF42ByaVpYL8GKg+myb5wGznwsLG46nwGgvhaB9cV0SwXCg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "03F1044A6DF782189C7061FF89146B3D33608F17",
-        "timestamp": "2022-04-14T07:52:33.875135897Z",
-        "signature": "5I0xK60/DwwVzRC1oA8FqZo7XrArA9R5jTYg08TXMKL3Dd/UCacyT9TVxaG/ekyMB0lCGajkccjWdI2OyqTnDQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "BAD6693EFA5333479136B5B082C3C5A28FA97491",
-        "timestamp": "2022-04-14T07:52:33.916594881Z",
-        "signature": "7Ih2MIVMCUL78lPWZ22PGeb+TE1YKbrszO3Z/0awoEEmMBeWbRQBZgM6D5uWUbqc5SQ5fj2e2kYz8u04lFhfCA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "EAB5D30E6F271470A37635E9889D613D41DED830",
-        "timestamp": "2022-04-14T07:52:33.822011898Z",
-        "signature": "ZcPUxJD52JOwXotNM+GTkivFcifihb9wq8xDQaBVKaJd7drQjHSlUMvCnQuDXcMlE0D2x909q+P2WNc0NkM1Dw=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "A85A278B256FF30E21057079F675644518010CDA",
-        "timestamp": "2022-04-14T07:52:33.948758137Z",
-        "signature": "ohveTMYCrItd9sGDPMPtALuigGVDi+uJANV/CUJLzqwBhIxNsABG5WhBDdrfZRI5vHzPfSUNtMbRAt+CpzUJBQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "4342666C1595411A1C58CD949FB607F1DC473CFE",
-        "timestamp": "2022-04-14T07:52:33.913213874Z",
-        "signature": "CxX/ysvqpm8nsHLptr/6Q9PFCKgIxvswTcv6KJqiS5ymk8Usi9u5pGZNspu/mUgVAgJOT1yq/wHB3NL7FsklDA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "09F4D1088EAB7E6EA2A87EE087A1467D23F22367",
-        "timestamp": "2022-04-14T07:52:33.977741332Z",
-        "signature": "IPV62zvcVPGN2BqTf0l9OuLSbOf+fixNQgG5TcA8D39wlz1Midwx1LcfVxXS2sQYpUDxoHro5QTG0ha95mnBAQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "A7B9EC7F97BD9F35E92F9CF873CE2CC618488BA2",
-        "timestamp": "2022-04-14T07:52:33.955291444Z",
-        "signature": "qY2HRpwAdA7JG3qqXzUQn1ox/hmo+BnnSID5ctslSsvwMZujxBCsx+7dMrDoIqnwP82IjI9wu8wvdIpIzXUCCQ=="
-      },
-      {
-        "block_id_flag": 3,
-        "validator_address": "46387FF5D4E466F61891D04837E4C85294DB1FA5",
-        "timestamp": "2022-04-14T07:52:37.945040122Z",
-        "signature": "u7YUoivwzs5uN+TQTvHRB7eyIhGOzOzpPUyuMWq5p07GtdQJ4Z8j8NjmFyAvQKSl/++2F7h7IehmEMv9zZXODA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "6B8A4D59A6C9B32622BE6E13CA3C9B89890DF317",
-        "timestamp": "2022-04-14T07:52:33.896204322Z",
-        "signature": "2Le62jKu6sdh83iiW+fWJG5m0UPcLcUId5w/JnVqYs628sbmcZmSf/xPuvniENWVQCRhYQrE59u8TlxDUp0zDA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "B85CC62F660DC5416C2A19733E7FB4147D5A1BDC",
-        "timestamp": "2022-04-14T07:52:33.965734652Z",
-        "signature": "li1owrnyoTGd0gW82udA6Dj/sHu6aPQ475RkhMttH+SCRF+zjxJv3eXQ+jQ/QftaNJr/f5I+iswqYhjisgU2AA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "2EC4B0E7E14949855ACD6976D1E11C2080DF0AE3",
-        "timestamp": "2022-04-14T07:52:33.883919347Z",
-        "signature": "/+XyGFufBUhCJB5CItF7QULJuQ6JuoHwY5CR86fE29ahEtjCXqvnbHA/hL7hVDZ0yZ3OGng2/M8mZ0tiuXzgBg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "3E5203383282356A08F17ADF86BEE43482D7821C",
-        "timestamp": "2022-04-14T07:52:33.948533772Z",
-        "signature": "ZmsLZdA7DcCBuZDCrCLXyotdHMj3BTJxMuXjWbqmhYTwFdxw6IeUapAgFI9HmgQYIe470W5T/XQXLM8pKp0zCA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "DA1662059918F943B478CC432345E9CABD0B84D0",
-        "timestamp": "2022-04-14T07:52:33.966697203Z",
-        "signature": "w33lYcxlgZCz9c+yMJrR4fHnx6JXdA3Y9C1xq5XnBr61unx5mbD3PwdXJoxekaequdtuwGKOwlm3Ilf7y/JgBQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "0EACA93ECFF404F8C6675A05C6CEEBDB60E94E67",
-        "timestamp": "2022-04-14T07:52:33.903813219Z",
-        "signature": "DSCFvK8rOyvYqMFmgHz4ifuXHB425TysBIEN1a15j1NBKJTe47AOeyimRxD0QcTwDtMqlVqDP0RQmY/FqbxIAg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "3050EC11FD87A5650113CCC2D88B4CEB4A33F4E9",
-        "timestamp": "2022-04-14T07:52:33.902721724Z",
-        "signature": "51WrpCpPyktY5t7lsbsPzWgfKzJjOucs26IeNtymOWi0HRBdG03s6UCTKGxJwpagTw/+fXjsW9Tpa1UTRM5/CQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "F6204971AA2A655087E16146A39D730336783EC7",
-        "timestamp": "2022-04-14T07:52:33.894105731Z",
-        "signature": "XO68atiTR0wuTLo0hw+6kdUuyBUrDhJtWpvGwYDr3K1hPjcM9R44k8OXbyTcvLsv7GTK85FY2XOTi+6LrMzRDA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "D83F63EDC86900F07BF03F76777E748F637D30B6",
-        "timestamp": "2022-04-14T07:52:33.891952948Z",
-        "signature": "ylRqDHzF0vDjr1L3QZCxydB2bKgYL7W4BO17ETYLPqlNSpu3dbcjVK4+PPaDjB4pWYYl8o5yoVw7n22u+1hlBw=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "F617C06738A76B99B51F1B2F23F7F606CFFAEC7E",
-        "timestamp": "2022-04-14T07:52:33.895358159Z",
-        "signature": "AUGmFAecT+sqlPOjY0f7Y/BLw2TUB3UCsomw2XM0xinY37f3FNflxQWIkodgI98Rt5abQ6gsOkpnha83mQ5NAw=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "8ED38173BF8EAE85955C1CE8CC471C87A3950309",
-        "timestamp": "2022-04-14T07:52:33.927364939Z",
-        "signature": "4Qr/xA1s2zRnQIWuhlaWjxmSvPP4PLVUrOlepIJOkOD5IedSGQuwtAL2MsJ4l8cXrfx3Dz85JqiEejBOdaHzAA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "352E90351E5605C7C991BB4B4C076196851795CC",
-        "timestamp": "2022-04-14T07:52:33.943534076Z",
-        "signature": "RWD2HzMukwL6bDB8DwRX8yspMNDQL61+aHtFBzB+fttpMZA7in+iyvW8UKbx5H3ZZh1BZSQ+pgKJIuyzkldrCg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "628C6B13D44802869464D0763F7B946B105C1C4F",
-        "timestamp": "2022-04-14T07:52:34.014354318Z",
-        "signature": "3OwaoPDGYCYqUXuKU+FX6bCfpyFbI85NNDWZ3PPeAJ9n3de0GCR8QGBfkUc0g0h8nnXqrNidkt2r0HLH4llKDg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "6518C991A8C3F9C94899423D32623E8E1069649B",
-        "timestamp": "2022-04-14T07:52:33.947923197Z",
-        "signature": "lDsqlaxL4Vpn4bL/U5tjsDg5qjScIo1hFRrm5FihX/TAAhL812TM/OTjAITbEccNBCcjJhFrA0KnXPGDjFadCg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "7F8E54ECF4E33A0A9B07394C4DE15F57AB86A648",
-        "timestamp": "2022-04-14T07:52:33.893345159Z",
-        "signature": "gOg13rDOjEg24JTJCug5I8CfUbutDnX2/70YOUydV/4uGiMyHe9UU4hcNSRXMsX1ZYye77DxGRq4SOG6nHLnDQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "B14790FAFAB929B56513EBE7BC5ABB25D1883CE3",
-        "timestamp": "2022-04-14T07:52:33.93583778Z",
-        "signature": "KuOyvyTYRLuq0emzAXQRHnyaWLe8ozXZR+109pOVKRk+UFut0IAUxPjynCz8PKStv/XkyDbS0w3StsNygfO+Cw=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "C23DD7A2BDB836A97C09046FB8247871BD5741CC",
-        "timestamp": "2022-04-14T07:52:33.984675309Z",
-        "signature": "IJaB0A+79QXvy3fgZc/8HbPVSymDuSIRf0oQJq8dZjBlsRLrr4GGs6eBauqID52+kAKHPNO/SH+OuRHNCk6FCA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "33479A3C40E3827C2CB1775FF69B1F8C01F1C97F",
-        "timestamp": "2022-04-14T07:52:33.932691066Z",
-        "signature": "B0sot4lgyxaivEbymHFzUh9tUfQoHNu7B82vavwnGAVs+BsPVC5yqsUFL3UviDuBUUdz9A4LdzsAHkcCn/TEBA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "2B5CA1444614CD5693259A2836F237E695C20374",
-        "timestamp": "2022-04-14T07:52:33.931461341Z",
-        "signature": "wBkQGvp7HnBl0GcLqL/Yf9+aFJX4cL2c02yuJbiSJbxprPLb2fGVezwkrQxZevotJ5gnrIJkYVytW80Nb71nCw=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "B315C0E5926653484495AB4D38055A15C0BF43FE",
-        "timestamp": "2022-04-14T07:52:34.00036607Z",
-        "signature": "jjDrFCjUsXra3qe7YQSgyROPIPLKyNUa6F/WRTTQTyuip1fU0R4WRK6gxVKTsgcyWJF3KQfVg+TxNPsfPs06Cg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "8700D7FEC0879EFA716909F686176D87B346B40E",
-        "timestamp": "2022-04-14T07:52:33.874461806Z",
-        "signature": "piUqWW89xUYRjsEnxBEwROgFek8kCW4faObb7VOmm0ub7Nq60hbDhpxges1tjLhByGXc6rh6o3j21sFIc2ZhDw=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "81875DA3D4465AFC9769B351F2A038304DD646FC",
-        "timestamp": "2022-04-14T07:52:34.008911756Z",
-        "signature": "GA/wwpF5IZQj2ZCdF9CbqgP58uwxYkz/6adcpvDMsx2G1Z9f/1Es128GIkc6irxfIc8HMqRCrg9kBniLilCPBw=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "0E0402827BF366AEB78362B097BC394C4AB44E81",
-        "timestamp": "2022-04-14T07:52:33.8677605Z",
-        "signature": "ae/UG3XI0zPgzp6AhjjiLqlpJakdKIOkyFduRtu3BDnGh8MuiWbuwYDNLpZPxqor8CuBtfFQQN+4Wjgls4lnBQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "AFB99D32657A2034F2C5400D78C66E8E507AF941",
-        "timestamp": "2022-04-14T07:52:33.933281067Z",
-        "signature": "U6su6S7ViquugX/6BNnTeuYh3G7p9hS65rVoq1pBAzgUN65/ZD6CUMi+Rv8ZSr9jaILSiIieJy1JlGb3wecMAQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "C5FE3F4F3091BFE32A61E50EAC660E9D7A2EF7A6",
-        "timestamp": "2022-04-14T07:52:33.847676476Z",
-        "signature": "VfiTA1FogVv5IO5AOlhMMQU8e1VOnsmSgB5gLxsGlGoeXVj/Pp+3mrQIE4thUPGRXyZvDI+QaFB8l3iDEQMjAg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "C4456081E1163BF2323D3D354EDA3AB614F24F83",
-        "timestamp": "2022-04-14T07:52:33.888619411Z",
-        "signature": "c/CPqU0JG0Xy5PrfP8sMVjqIUxk4GijE6C80zROH0VOvRQaQ0E288MM8N4ZISQK7AwiEMF+Tcx6wzo/NQDXcBg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "7EED60460B269EFA5D8B08A26C0E1D814AFF64DC",
-        "timestamp": "2022-04-14T07:52:33.937532147Z",
-        "signature": "WJ/UbF1dXQ1NY2bZzw/WcZMTWL4Qjc8+hn7VA3V1/ar2NWu09OigcKSMVNnM7OwRZyX0WIgjTnKysD9rTzuQBQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "23133C4595E8DF70B816B5FE370FC2A2236D289E",
-        "timestamp": "2022-04-14T07:52:33.902898336Z",
-        "signature": "czCfr3VcSaFEbPhI3DzXpD+t/QYhhvwvzeU0OdbcGK9uTmCp9K7jcLiaUVc6Dx2b0C5BOa+YYlVeT6slIQCLAw=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "3CD42258ED58B0251D3721E9C7794FEF02DEEB65",
-        "timestamp": "2022-04-14T07:52:33.943636445Z",
-        "signature": "nJvJKkuMLnSRmF9czfGooEeAMxTWBstIIaLDU6aiWgknhAQrZN3/1VUmxc9o2fJG2HJpFRrTh06aKSft/Uy+Cg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "A76175C0D7D55FDC57E7533A081F8A9B186D718B",
-        "timestamp": "2022-04-14T07:52:33.899216378Z",
-        "signature": "S6rnEmrurT0JsYvvrairdn5VOOp9mLD6jgBPYZAbC/x8errZMQdm08c5ooyEGYHSRHuuc2g7eqjVH50i9wBnAw=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "BE756A959F2CBE58542FF246D6D6BB8E728191B3",
-        "timestamp": "2022-04-14T07:52:33.934581952Z",
-        "signature": "dXnBT/5A+8CBWH36/GKvhFdiZktHNmNkjolRckFzXiNxcL+wuU3qjZMqVmohxh/kcKBxIuV7RigsegIg1RmJAw=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "7FA1FB4D6C52A814F112B963AA88EF427FE7CD72",
-        "timestamp": "2022-04-14T07:52:33.886367881Z",
-        "signature": "2BIkeQczV+3zZjmP14CusZHwC0Dvn296CokyGs2PJeiGe4VwjSesKzl8ptxI1i02tWwqYoTeBzxUReh1aGGGCQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "8911065B7BA2C2235A4CB996B1A2C433E69A617F",
-        "timestamp": "2022-04-14T07:52:33.867223901Z",
-        "signature": "fDoCxLgaiMFrySOJxOq5qnThJNHYQMCS/OQ1mfAy2eCOsoPsfzs0eGr94D9K4RZeK3PvwOXAN9JWdX9SVXqLDQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "8A033BD3830BF187779409E1651F4E82B6B8E5D8",
-        "timestamp": "2022-04-14T07:52:33.882866438Z",
-        "signature": "hGbNdDol/Ts5mM4ePoB27EiWMDLUKJzcdEGatXxP7wrP+i5sA6xif7EFaXzmDz0n4M8RSRpds6BHPOHog8ovAg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "F214F894751C8B7BAC62FB1DE98D19ED1F98604A",
-        "timestamp": "2022-04-14T07:52:33.946890864Z",
-        "signature": "ZLPYgqm5SHjgxwyc1CWNBxqqWvVZ9OcrLdnUVciNFYsRKC3NOyNpRbYtyLgVNSZPQwSs5UV/sOJELuD4Z8Z6BQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "25A30FE88ADE7817AA86D94D056A7BBB97540D18",
-        "timestamp": "2022-04-14T07:52:33.833070775Z",
-        "signature": "aH+tpm0v4ODvsq9lNFd9D7lp3Sg0v4dXFepSZ+0DoE3a798lFRhauzAnzMGHg3bC5hiTv2AW/No5T/ERl33nBQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "4A28AAB7BB3117858A129DED53D812558F6C8A02",
-        "timestamp": "2022-04-14T07:52:33.957379945Z",
-        "signature": "w5klvmWoKZuzf94ebjwDa5qVmrcgX/SOAnWM6kIzzUrkI/MjXZjMn5WePtI6dhF+0c3ttAiEfQJN8UAPusRvCw=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "E7DC8AD584DAECB46C42F972D6D3E4D4B65DD6B6",
-        "timestamp": "2022-04-14T07:52:34.219257162Z",
-        "signature": "e7quVi6UzZ2Cw/PQtSawQ7CAT7BzvW4YwuS5Wczzyu0sWvg5szZdFUmXTe5q6sdl+4qjq6sPAhuajdUajeBCAQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "33F2583A28E7227356AD6B423AEE8325CEB9DA52",
-        "timestamp": "2022-04-14T07:52:33.921088338Z",
-        "signature": "4uIzXiWswKT5JU1FyzA6rjT2Lv5ni3joGHF0qEKuavRKFTXMin8CPm/GRiU0UTZmhYzAh4d96vGa3Es2/bQjDA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "09EE417F173A1F340E5C53A42C41B3E878890340",
-        "timestamp": "2022-04-14T07:52:33.881423271Z",
-        "signature": "ao2Gc4fAqM+3LnwzN6RgkhTI8wuvorCx2kqrc2BaAV4+ibG4qUUiYEOgfhMObDf32F6I6j/vPnOGRDlqDKu/AQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "2AAB6CA116BC52DCF7A32569114291FF1D7A32CA",
-        "timestamp": "2022-04-14T07:52:33.886147184Z",
-        "signature": "2vJIdQXYpdrElEsep2hFrq/DsJrgZqXE+NsQCNZazvbRnLl9vr4HrnsLnLSIBkbl9xel9T2/KL4Aa8/NMSesCw=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "6060A27F639300584BD095F881C2A8714538F0CB",
-        "timestamp": "2022-04-14T07:52:33.942592602Z",
-        "signature": "p4rVbiLaaclEn0CMeoHNRaRwDyaRWQWztTfrR7xhLeZ7O9nDuWtftPTTA1MuwzsUeGnL6qMIPlIIjKF9irRiAg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "C3671ED4ED22EB622312E76615CE286ABF0AC53D",
-        "timestamp": "2022-04-14T07:52:33.879020462Z",
-        "signature": "XTLdspKUnlw1SHiw2NYb4MZQZFgZq+OOFOHG53Aq/86o3oGyN57mY82yS+RLmSEet6n+KKW4WuR8+2KJCJuoAA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "F5F246DEA8E27C59F6D0884CCAB31ABDB589F4CE",
-        "timestamp": "2022-04-14T07:52:33.89889915Z",
-        "signature": "HXLuWVGBRO6B/olGgAl4W6HGNmbyp5cmSLVO4ZPde9miRhvVzFU/NurytMNhGBUBu5+z8Sa+Zu+bG39OlPdBCQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "0C3A78D0F3B2ED2E9ED3F3DB6289185D40742870",
-        "timestamp": "2022-04-14T07:52:33.91923213Z",
-        "signature": "2baYTKRWAatJmWL/mKxrUaPa1tUpzrQ7JuLClFWP8snhOozHN66IwrK7a8DEYpIprJ2k/WQEY40abTQ4el9nBw=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "B423FF79F90608BC76DA0AB850DEED5A7231E678",
-        "timestamp": "2022-04-14T07:52:33.924263801Z",
-        "signature": "XU8g6Eao+jqcMld8v97z/iEvDbDRSB4MjOOdqz4CAHf7c2TNY1+I+9iqAG8YU7tKoDWckgSA4en7mUu5SvasBg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "B4B28030F3503F0650D0F12A70FCDDA6A6A844E0",
-        "timestamp": "2022-04-14T07:52:33.940053644Z",
-        "signature": "v2xN5tRKt7x9krj9DiI/ZJWRHQrHjnpEQZJ3SU8j6resu7y7Q0JsVEnCjWmuIcKhJgc6AxK5olf1MhmOS5gDDg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "C2E2B0C72E6A427EC87E23675CE1A3EAEC30618C",
-        "timestamp": "2022-04-14T07:52:33.984048042Z",
-        "signature": "v4K2aXKdcwdUmZWmYIfXoTkb7eJL0lQ+Y9LZ5st/GX65o9fmoWMQSS9N5usqza3evt+XPJfapiezW+rMJqBHCg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "E3461442CDD237B39BC3F40063FF4712E2E066F2",
-        "timestamp": "2022-04-14T07:52:33.942541279Z",
-        "signature": "ScPbwMwLL5e7hiRKO/IyllXhnT8Ifu2T64EUxqPjM/LDh4XwEQhsXCJHWbZEkX5JHVEp7kWyaEfc6B8163mWBg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "1A302C41C4E175F2D61E9C3FD2195C3DB7545407",
-        "timestamp": "2022-04-14T07:52:33.93829292Z",
-        "signature": "BjgWxTQVajqmzZQZRZJi3V39VgDwazOsfqJFM/acaiCv9Oo3wlCH358pUGXHtTujLr3p8M2PEreFcp/7V9LBDQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "DE9CB7EB31538B3846C2EB36A9E3C4341EDF6A95",
-        "timestamp": "2022-04-14T07:52:33.871429849Z",
-        "signature": "pe9FGfJjngntnzuFzS5kPAojjkmk6+LD/2M1KsVp74FveU8mpAiEiYvYh8n0v92Sb5djoOD6F3s8F06C9suoAg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "1C8BCA4A78B616E2ACEE8D0E218087614D85823B",
-        "timestamp": "2022-04-14T07:52:33.909438503Z",
-        "signature": "0HmvyxC3WWRmttUHZ/01mwp2lyvSRaM0pO1dRx50M+BxyZ3jgINGNauNEjJo54csq8H6ow7dwoT/UY+XE5cBBQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "48666481633E7C3A717BE6180449F2143E95A53F",
-        "timestamp": "2022-04-14T07:52:33.903349178Z",
-        "signature": "F9bnteb/6c/T3Mi/4yUyXWUVRKTneTJ/gQmFu2fbQ3qVvvi9Nm0CN4XOMxv8gSpxc5FVhfgbWGBZleOX6V2MDQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "DEAFFD4536C979DB03184C422FE5B3D020490372",
-        "timestamp": "2022-04-14T07:52:33.882483659Z",
-        "signature": "vqi7SJigSj6PDzt0VBLdZfb6xEL4v7Ih6930unpDWrgpBctEfQVIKBW/BEP2UZZvAxfdSqb5l9XG4DjFbFR+AQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "107524E392B718F087153DF0405BC58853F4DCEA",
-        "timestamp": "2022-04-14T07:52:33.886372524Z",
-        "signature": "ce/cp+MZIBHQA22uqOhu85sA0BqJmfXcBhG6TvcCutfmILkAJtcpUF8obgp7hWYH3uUKJ6VnbbDzgpIWMAyNAQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "23012F4B162F9805888DCBB3A04A475AE2867184",
-        "timestamp": "2022-04-14T07:52:33.961357434Z",
-        "signature": "KMe3UCtOkqgZvYJ3aXcuBtbWEAslZ6pjx7scD09jhMcbQHmBls1va8vW3d09lTzMr1erHTt8revAMHPHLcVpAg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "EF7E1D03677202D2A845452B42E47C6A5F047649",
-        "timestamp": "2022-04-14T07:52:33.880907414Z",
-        "signature": "DSxqFunRRibkWkEJRq4zwUdCaO8SS3oHp1xeQAjyYebEt4UajdY9WrSboyquF0dzK+ll7RH9WjPolS1rQJZdBA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "43F8A1A85AEB63533830AF2476306F0641E42BCA",
-        "timestamp": "2022-04-14T07:52:33.924804598Z",
-        "signature": "Wb1qEyJ63qIZIQelyCRmQ2EdYgXTmfEkWS5wVCDr0BieD+QMlycX9HKPV29Gf4d5o6FcnEHSCT/mv8LNdtAuAg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "E94F109D064F48DF1147A1487338FE785A0CA285",
-        "timestamp": "2022-04-14T07:52:33.842587485Z",
-        "signature": "vIAWj7j2tloOCW1Y6S+AAajx5uCABMDFNAb6Y3bC0Hq1SRGSCJC0A5jAGYqcxn/7PAHD7mdqAgWbmeFOF4r1BA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "4609FD57FBDDC077A2C68ACD45782D9B25CB894A",
-        "timestamp": "2022-04-14T07:52:34.11149712Z",
-        "signature": "OxTf6b9V3PzrNmCnS6zft3pbl3Tqrcr0AYBrl/4cOZZ+/HupRmc0Cckdbuti4cY1UbjlvoDr2mWe+LhNi/hcCw=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "4FB44F29BE1F9941FB8A0E32CA463B67065AADB4",
-        "timestamp": "2022-04-14T07:52:33.976831752Z",
-        "signature": "9Lc/1XxND2a0nXUDQ5Tm++g4j9noxLI6m8dbO0YEMVefE3LaFSEdNVEQtIG1llhN0tLjp869xx5fOtb8N/olAg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "AE4A96CEC1423B86D6FA62F34ACEBFB281FD3112",
-        "timestamp": "2022-04-14T07:52:33.856149693Z",
-        "signature": "wBvnmo+4DzzhmIUT3izZCdTsW+L3wEt2bzNlKzmhFkJWiRMnDWOBHBDpG+Q3Cgsb5KDfxMW+kynGEJFRbuo6CQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "6A6964D3274DA12A0575BDEC7DB58C059D53CE10",
-        "timestamp": "2022-04-14T07:52:33.875321135Z",
-        "signature": "4ejz/jY9Hsgc3aQ2ZKO8Q39AXhoxZWSZ4tRAfUBZn77fRPr37sI8fVbu/HQO2bcv0fNdUUzX2M5wgKCyCVSCAA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "830DEB89DB946F2B8514123E0A0CEA8D2F6DA726",
-        "timestamp": "2022-04-14T07:52:34.099862263Z",
-        "signature": "n3pgQzrNpuHckrpvN2C4HTzWpgPuhk+yvpZWDwusSw+jQQr/4hskjkv8hoR4TsDNFO2FXHzbHHX4mD3IA3uaAA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "F91AC9B31A2ABFDA33F38816D02D082DEFBD2ED3",
-        "timestamp": "2022-04-14T07:52:33.902887385Z",
-        "signature": "ayaGI0JQWmoGDJLblDR7GJpYqjbqT3Ccb51IzTC/ZwLXmkjatxlN+3+4+CLnYk6CfJxRuiWsBYtSLFqhMSRPCw=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "9163DEBE8B3F6C37A204DE2678F6D5F1009B4EC6",
-        "timestamp": "2022-04-14T07:52:33.959494792Z",
-        "signature": "ITfE3vhZyOmgi1vVmc0VLsrlsneVRz9+phMTYSXxPu/1iG1XfgbC1Pbev08Xd2mdVksNpSQFPARouk/SFRriAA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "DCC2C2EC7FD1A8339BC34A1529DAC1711412FD96",
-        "timestamp": "2022-04-14T07:52:33.905452048Z",
-        "signature": "2PqctIN7lxQPYHghKoWSe5W9oy28BK1SlEdB+6hl5X3qlqmVU2NGYa0PBiCkhkq+k8UXmhIzKyOwz/6bvOlnBg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "B2B9701A3D2929285E9F1F5035DF65F2086223B4",
-        "timestamp": "2022-04-14T07:52:34.215622183Z",
-        "signature": "8gZDKFQYtXIXvb1E+ThX5qDfkXSzuA53hqcmbM6qFelPRIq+ta6anF20KrQY8YjWopQX2RuHA2ZZcl6FT1h1AA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "5F2D57512F251AE4E06C2D117273F33391750F43",
-        "timestamp": "2022-04-14T07:52:33.935519822Z",
-        "signature": "L2pPgkBz2akDvcstcANEeOvp4Qwf1g3aY1kpR2IcZuOsPtZ7wER9kQCjK9kTM10RJIWB4kRrgvFiXn0L6JOmAQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "582A84896F496809F359EDC222FEDC416F373D8C",
-        "timestamp": "2022-04-14T07:52:33.94923149Z",
-        "signature": "Ccyodn11h932ctLI1MxV/lYap9gxnVUDSsdjhna/kuNx2RSvuEeD/u9SUicBUXPUpPbqzxLG1SkA2hUi4Zv5Dw=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "DEBCE7328D1B8B0ECEA210141908F733D6B5FEEB",
-        "timestamp": "2022-04-14T07:52:34.383657541Z",
-        "signature": "kf3kkoE7QAI0vPUvvdRi/KWrMT50RDLMBqqAvlK3XBOYZIyHFod9dGfxAhFG5dMloD7jIqiWDRVVdYao27IgBA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "EA1FBB2E1EA6766ED1A51D3330C6E1E38934C543",
-        "timestamp": "2022-04-14T07:52:34.187181731Z",
-        "signature": "zkAPDsiKReUh2PaWV3PX6dKOwkZmgPWyll/V8XmfgGFk3ymZ1PGBuHIZ2KlpC637AnB2Y1t0cGekX6s236cDBA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "4C27A85A8055B381BEEF72658878AB442DD67106",
-        "timestamp": "2022-04-14T07:52:33.908674714Z",
-        "signature": "qLXPns/FCZSO0rQwck6ifL7sDgnhM/Yy9oHrsHFr531QpKIDrKoIZrqm2whCBs1RuNfPL0II7/QWGA5lFlCbDA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "AF3691263C43369774C461A4B2F168BB09A5DDD1",
-        "timestamp": "2022-04-14T07:52:33.960449971Z",
-        "signature": "RWmVGGq6QXP9ti1NQCB7EUf3QipB1FeiVty66lQvJifAgTmG9BWDaQOpLqe/p6gvEx0ESZawUWQvp5L3Nq+7DA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "B0AE11B935A1B3B7C2AB9FBBEC6EC7DF7E243F55",
-        "timestamp": "2022-04-14T07:52:33.899219543Z",
-        "signature": "R23ccKlU8N0nVSlZqhjHQaRQZQ/PXIQF1BgorJLuDp6QavQClYUBRvFW8Oees827rDQmCvmsi1FUsxYsZfrmCQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "C6AD188E37799621EFA778139823F1771C7539E0",
-        "timestamp": "2022-04-14T07:52:34.003983026Z",
-        "signature": "dKDJInOyi/4YH3Pr7VytlwxX2ATbHn4vak4NsgjlLZIZNj3eptv9RFzO/Yxkli7uOQIhN0c80Yz+kuPVBeyJAA=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "E9F7AE72FF98F98FE6F109CEB28B002D5C3AE234",
-        "timestamp": "2022-04-14T07:52:33.858520773Z",
-        "signature": "uQUB6z3mAk3PY9AJKXvg7/YPKVxrjJmVPfskVJuT/qugU8PS7E59Sw8H3Eca6ExwNle5LLCxuy+oUjvjlq1gBw=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "F305CFA31F9A8060E34EB5FD1FCD2E6FC6E0DC4A",
-        "timestamp": "2022-04-14T07:52:33.854407457Z",
-        "signature": "G+NY2T5TF3FWA/aDRysP5F/W3woEsZYSp7Y8+khaB9+t8P+NF9M+cEw5Dkru2w+LUpzL3H5qNmLMSYauSdZ0Ag=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "8312473768107B9D21048CEF310BCF89E00CC22D",
-        "timestamp": "2022-04-14T07:52:33.903177736Z",
-        "signature": "idHiXEpQBJ3icGYzbsbSC8KeU53tLJPcCVgXXNa01tgNtLL/ovWYNkClZwc923ztPv4NNuXyUC0ImpGmTZbGDQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "AE201075C1D2EF9970AC8EB0A8A4DC0BC121B37D",
-        "timestamp": "2022-04-14T07:52:33.9829821Z",
-        "signature": "O+JVxO2mc5xrBKoRlSD+FzguQCQf/qTZhH8muo3Vq8E20KbmyQUV1bgElmg9cGxuu9M2DyH4EcsSb8NRNppDCQ=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "C487F83AE5903E388231E5AA8D345D8977D56F04",
-        "timestamp": "2022-04-14T07:52:33.901238972Z",
-        "signature": "jYDqHlWuUMXvCZJ4BauCrM4Pzj/lRxOPtUmcm/tf+M1LA69balDuRGADkGx7TLlD0TjqGbXkRD55PF2M5NVqBg=="
-      },
-      {
-        "block_id_flag": 2,
-        "validator_address": "DB968E2D6C5D1CA87A67B79BCA7B9E5424C0DC72",
-        "timestamp": "2022-04-14T07:52:33.915773636Z",
-        "signature": "phweHuFyD6i2wYaFr5ka4l55H3rykWYY9ZO+yeCokSF6bIgSBzomLOftKtuY31VQAZxWg6CuR0g5IvCPgBNWDA=="
-      }
-    ]
-  }
-}
diff --git a/share/availability/light/testdata/sample-block.json b/share/availability/light/testdata/sample-block.json
new file mode 100755
index 00000000..2bb8d35b
--- /dev/null
+++ b/share/availability/light/testdata/sample-block.json
@@ -0,0 +1,60 @@
+{
+    "header": {
+        "version": {
+            "block": 11
+        },
+        "chain_id": "7sUWGE",
+        "height": 12,
+        "time": "2023-01-19T01:41:20.109585974Z",
+        "last_block_id": {
+            "hash": "MfZsPUTgVOBRak+3xnKdwWEr2NQ1v095T4BYaWcdYTs=",
+            "part_set_header": {
+                "total": 1,
+                "hash": "/qyxxHNcuOyYBcaGw90PqAa2GdFErMHkkbH66BDI1hI="
+            }
+        },
+        "last_commit_hash": "sQXqALyCQ+tHFKOjfQhB3+lQuud0d3C2ohuOgrO6YX4=",
+        "data_hash": "Pu8CIJqgqCFYkaSvfeS5jvb6+ThXtJkXeRDZPnb1auM=",
+        "validators_hash": "X7yBLGyFWnZvyakBElaaaqyV0iCSNTINfm+puFxcX/g=",
+        "next_validators_hash": "X7yBLGyFWnZvyakBElaaaqyV0iCSNTINfm+puFxcX/g=",
+        "consensus_hash": "BICRvH3cKD93v7+R1zxE2ljD34qcvIZ0Bdi389qtoi8=",
+        "app_hash": "pqd8GP5/icLOzlysLtq9IupqfLmoxNVySLWNarJssbE=",
+        "last_results_hash": "47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=",
+        "evidence_hash": "47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=",
+        "proposer_address": "oFwwfI48D9wGpICbXtGZNlx6xOI="
+    },
+    "data": {
+        "txs": [
+            "CpsCCnsKeQoTL2Jsb2IuTXNnUGF5Rm9yQmxvYhJiCi1jb3Ntb3Mxemdwamp4bWZhNm00ZjU5cTJsNjgzOGp1c2RjcmZ4eHc1ajI4ZG0SCF62zWQ6Pw9TGgLBGyIgo5vwRkbYLo3+Xm1IpV8weKHdFYfqkfDyt8a1vfthQQJCAQASWgpOCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA64OVjUldXAMb1uSZqrBNuYaatsk+CMGyQKNzY2vM5T+EgQKAggBEggQgIDpg7HeFhpAM88quyAFPvk6/4fuiolAJf3SmOLNv471av8uir6yHaJPdsusvOUQ6gK+/gwoksZ2Lytk48k3Gf4F+tcJO06ZBxIBBBoESU5EWA=="
+        ],
+        "blobs": [
+            {
+                "namespace_id": "XrbNZDo/D1M=",
+                "data": "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"
+            }
+        ],
+        "square_size": 4,
+        "hash": "Pu8CIJqgqCFYkaSvfeS5jvb6+ThXtJkXeRDZPnb1auM="
+    },
+    "evidence": {
+        "evidence": []
+    },
+    "last_commit": {
+        "height": 11,
+        "block_id": {
+            "hash": "MfZsPUTgVOBRak+3xnKdwWEr2NQ1v095T4BYaWcdYTs=",
+            "part_set_header": {
+                "total": 1,
+                "hash": "/qyxxHNcuOyYBcaGw90PqAa2GdFErMHkkbH66BDI1hI="
+            }
+        },
+        "signatures": [
+            {
+                "block_id_flag": 2,
+                "validator_address": "oFwwfI48D9wGpICbXtGZNlx6xOI=",
+                "timestamp": "2023-01-19T01:41:20.109585974Z",
+                "signature": "mPRPdLbp8cQcZ2w6CmWlmE+4lVzX9YgxzxOBp7lYTT8jYmehJC62sC/Nt/X/ezVW7u9OCXZjGG2oIDYmabKsAA=="
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/state/integration_test.go b/state/integration_test.go
index ffb84b92..07bf044d 100644
--- a/state/integration_test.go
+++ b/state/integration_test.go
@@ -2,21 +2,26 @@ package state
 
 import (
 	"context"
+	"encoding/json"
+	"os"
 	"testing"
 
+	"github.com/cosmos/cosmos-sdk/client/flags"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+	abci "github.com/tendermint/tendermint/abci/types"
 	rpcclient "github.com/tendermint/tendermint/rpc/client"
 	"google.golang.org/grpc"
 
 	"github.com/celestiaorg/celestia-node/core"
 
 	"github.com/celestiaorg/celestia-app/app"
+	"github.com/celestiaorg/celestia-app/testutil/testfactory"
 	"github.com/celestiaorg/celestia-app/testutil/testnode"
-	blobtypes "github.com/celestiaorg/celestia-app/x/payment/types"
+	blobtypes "github.com/celestiaorg/celestia-app/x/blob/types"
 
 	"github.com/celestiaorg/celestia-node/header"
 )
@@ -51,7 +56,8 @@ func (s *IntegrationTestSuite) SetupSuite() {
 	s.accessor = accessor
 
 	// required to ensure the Head request is non-nil
-	require.NoError(s.T(), s.cctx.WaitForNextBlock())
+	_, err := s.cctx.WaitForHeight(3)
+	require.NoError(s.T(), err)
 }
 
 func setClients(ca *CoreAccessor, conn *grpc.ClientConn, abciCli rpcclient.ABCIClient) {
@@ -110,3 +116,32 @@ func (s *IntegrationTestSuite) TestGetBalance() {
 		require.Equal(&expectedBal, bal)
 	}
 }
+
+// This test can be used to generate a json encoded block for other test data,
+// such as that in share/availability/light/testdata
+func (s *IntegrationTestSuite) TestGenerateJSONBlock() {
+	t := s.T()
+	t.Skip("skipping testdata generation test")
+	resp, err := s.cctx.FillBlock(4, s.accounts, flags.BroadcastSync)
+	require := s.Require()
+	require.NoError(err)
+	require.Equal(abci.CodeTypeOK, resp.Code)
+	require.NoError(s.cctx.WaitForNextBlock())
+
+	// download the block that the tx was in
+	res, err := testfactory.QueryWithoutProof(s.cctx.Context, resp.TxHash)
+	require.NoError(err)
+
+	block, err := s.cctx.Client.Block(s.cctx.GoContext(), &res.Height)
+	require.NoError(err)
+
+	pBlock, err := block.Block.ToProto()
+	require.NoError(err)
+
+	file, err := os.OpenFile("sample-block.json", os.O_CREATE|os.O_RDWR, os.ModePerm)
+	defer file.Close() //nolint: staticcheck
+	require.NoError(err)
+
+	err = json.NewEncoder(file).Encode(pBlock)
+	require.NoError(err)
+}