diff --git a/go.mod b/go.mod index 47adea6b..f4570168 100644 --- a/go.mod +++ b/go.mod @@ -41,9 +41,10 @@ require ( github.com/swaggo/echo-swagger v1.4.0 github.com/swaggo/swag v1.16.1 github.com/tendermint/tendermint v0.34.29 - github.com/uptrace/bun v1.2.1 - github.com/uptrace/bun/dialect/pgdialect v1.2.1 - github.com/uptrace/bun/driver/pgdriver v1.2.1 + github.com/uptrace/bun v1.1.17 + github.com/uptrace/bun/dialect/pgdialect v1.1.17 + github.com/uptrace/bun/driver/pgdriver v1.1.17 + github.com/vmihailenco/msgpack/v5 v5.4.1 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/sdk v1.24.0 go.opentelemetry.io/otel/trace v1.24.0 @@ -169,7 +170,6 @@ require ( github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-getter v1.7.4 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect - github.com/hashicorp/go-msgpack v0.5.5 // indirect github.com/hashicorp/go-safetemp v1.0.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect @@ -245,7 +245,6 @@ require ( github.com/ulikunitz/xz v0.5.11 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect - github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect github.com/zondax/hid v0.9.2 // indirect diff --git a/go.sum b/go.sum index e96d2e7b..c39f8f22 100644 --- a/go.sum +++ b/go.sum @@ -721,8 +721,6 @@ github.com/hashicorp/go-getter v1.7.4/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI= -github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= @@ -797,7 +795,6 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= -github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA= github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= @@ -1078,12 +1075,12 @@ github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljT github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/uptrace/bun v1.2.1 h1:2ENAcfeCfaY5+2e7z5pXrzFKy3vS8VXvkCag6N2Yzfk= -github.com/uptrace/bun v1.2.1/go.mod h1:cNg+pWBUMmJ8rHnETgf65CEvn3aIKErrwOD6IA8e+Ec= -github.com/uptrace/bun/dialect/pgdialect v1.2.1 h1:ceP99r03u+s8ylaDE/RzgcajwGiC76Jz3nS2ZgyPQ4M= -github.com/uptrace/bun/dialect/pgdialect v1.2.1/go.mod h1:mv6B12cisvSc6bwKm9q9wcrr26awkZK8QXM+nso9n2U= -github.com/uptrace/bun/driver/pgdriver v1.2.1 h1:Cp6c1tKzbTIyL8o0cGT6cOhTsmQZdsUNhgcV51dsmLU= -github.com/uptrace/bun/driver/pgdriver v1.2.1/go.mod h1:jEd3WGx74hWLat3/IkesOoWNjrFNUDADK3nkyOFOOJM= +github.com/uptrace/bun v1.1.17 h1:qxBaEIo0hC/8O3O6GrMDKxqyT+mw5/s0Pn/n6xjyGIk= +github.com/uptrace/bun v1.1.17/go.mod h1:hATAzivtTIRsSJR4B8AXR+uABqnQxr3myKDKEf5iQ9U= +github.com/uptrace/bun/dialect/pgdialect v1.1.17 h1:NsvFVHAx1Az6ytlAD/B6ty3cVE6j9Yp82bjqd9R9hOs= +github.com/uptrace/bun/dialect/pgdialect v1.1.17/go.mod h1:fLBDclNc7nKsZLzNjFL6BqSdgJzbj2HdnyOnLoDvAME= +github.com/uptrace/bun/driver/pgdriver v1.1.17 h1:hLj6WlvSZk5x45frTQnJrYtyhvgI6CA4r7gYdJ0gpn8= +github.com/uptrace/bun/driver/pgdriver v1.1.17/go.mod h1:c9fa6FiiQjOe9mCaJC9NmFUE6vCGKTEsqrtLjPNz+kk= github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk= github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs= github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= diff --git a/internal/storage/types/packed_bytes.go b/internal/storage/types/packed_bytes.go index 89303934..2a5b1e79 100644 --- a/internal/storage/types/packed_bytes.go +++ b/internal/storage/types/packed_bytes.go @@ -15,6 +15,9 @@ type PackedBytes map[string]any var _ sql.Scanner = (*PackedBytes)(nil) func (pb *PackedBytes) Scan(src interface{}) error { + if src == nil { + return nil + } b, ok := src.([]byte) if !ok { return errors.Errorf("invalid packed bytes type: %T", src) diff --git a/test/data/message.yml b/test/data/message.yml index bef9dfc0..a24e312d 100644 --- a/test/data/message.yml +++ b/test/data/message.yml @@ -29,15 +29,7 @@ type: MsgPayForBlobs tx_id: 2 size: 200 - data: - namespaces: - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAACt6d6t6d4= - blob_sizes: - - 12 - share_commitments: - - 0CsLX630cjij9DR6nqoWfQcCH2pCQSoSuq63dTkd4Bw= - share_versions: - - 0 + data: 0x7B0A2020202022426C6F6253697A6573223A205B0A20202020202031320A202020205D2C0A20202020224E616D65737061636573223A205B0A20202020202022414141414141414141414141414141414141414141414141414141414141437436643674366434220A202020205D2C0A20202020225368617265436F6D6D69746D656E7473223A205B0A202020202020223043734C58363330636A696A394452366E716F57665163434832704351536F537571363364546B643442773D220A202020205D2C0A2020202022536861726556657273696F6E73223A205B0A202020202020300A202020205D2C0A20202020225369676E6572223A202263656C6573746961316875767865726B6D336167677779326164617A3678306D673833676661356E64656D7235346E220A20207D - id: 5 height: 999 position: 0 diff --git a/test/data/rollback/message.yml b/test/data/rollback/message.yml index bef9dfc0..a24e312d 100644 --- a/test/data/rollback/message.yml +++ b/test/data/rollback/message.yml @@ -29,15 +29,7 @@ type: MsgPayForBlobs tx_id: 2 size: 200 - data: - namespaces: - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAACt6d6t6d4= - blob_sizes: - - 12 - share_commitments: - - 0CsLX630cjij9DR6nqoWfQcCH2pCQSoSuq63dTkd4Bw= - share_versions: - - 0 + data: 0x7B0A2020202022426C6F6253697A6573223A205B0A20202020202031320A202020205D2C0A20202020224E616D65737061636573223A205B0A20202020202022414141414141414141414141414141414141414141414141414141414141437436643674366434220A202020205D2C0A20202020225368617265436F6D6D69746D656E7473223A205B0A202020202020223043734C58363330636A696A394452366E716F57665163434832704351536F537571363364546B643442773D220A202020205D2C0A2020202022536861726556657273696F6E73223A205B0A202020202020300A202020205D2C0A20202020225369676E6572223A202263656C6573746961316875767865726B6D336167677779326164617A3678306D673833676661356E64656D7235346E220A20207D - id: 5 height: 999 position: 0