From 9b4ee38b1ffbc53904ee834a4dd1a20aba0ac9db Mon Sep 17 00:00:00 2001 From: Wondertan Date: Wed, 10 Mar 2021 22:23:12 +0200 Subject: [PATCH] change Proposal type to have DAHeader instead of BlockId --- go.mod | 4 +- go.sum | 48 +---- proto/tendermint/types/canonical.pb.go | 119 ++++++------ proto/tendermint/types/canonical.proto | 2 +- proto/tendermint/types/types.pb.go | 255 +++++++++++++------------ proto/tendermint/types/types.proto | 2 +- types/block.go | 97 +++++++--- types/block_test.go | 9 + types/canonical.go | 2 +- types/proposal.go | 37 ++-- types/proposal_test.go | 34 ++-- 11 files changed, 307 insertions(+), 302 deletions(-) diff --git a/go.mod b/go.mod index 6e06bdbe38..8cdab623e1 100644 --- a/go.mod +++ b/go.mod @@ -16,14 +16,16 @@ require ( github.com/gorilla/websocket v1.4.2 github.com/gtank/merlin v0.1.1 github.com/hdevalence/ed25519consensus v0.0.0-20201207055737-7fde80a9d5ff + github.com/ipfs/go-cid v0.0.7 github.com/ipfs/go-ipfs v0.8.0 github.com/ipfs/go-ipfs-config v0.12.0 github.com/ipfs/interface-go-ipfs-core v0.4.0 github.com/lazyledger/lazyledger-core/p2p/ipld/plugin v0.0.0-20210219190522-0eccfb24e2aa - github.com/lazyledger/nmt v0.2.0 + github.com/lazyledger/nmt v0.2.1-0.20210311211820-a5c8085cd40d github.com/lazyledger/rsmt2d v0.0.0-20201215203123-e5ec7910ddd4 github.com/libp2p/go-buffer-pool v0.0.2 github.com/minio/highwayhash v1.0.1 + github.com/multiformats/go-multihash v0.0.14 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 87f8ad4eb7..6f883a9f30 100644 --- a/go.sum +++ b/go.sum @@ -75,13 +75,10 @@ github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZw github.com/benbjohnson/clock v1.0.2/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= @@ -166,7 +163,6 @@ github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0 github.com/dgraph-io/badger v1.5.5-0.20190226225317-8115aed38f8f/go.mod h1:VZxzAIRPHRVNRKRo6AXrX9BJegn6il06VMTZVJYCIjQ= github.com/dgraph-io/badger v1.6.0-rc1/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= -github.com/dgraph-io/badger v1.6.1 h1:w9pSFNSdq/JPM1N12Fz/F/bzo993Is1W+Q7HjPzi7yg= github.com/dgraph-io/badger v1.6.1/go.mod h1:FRmFw3uxvcpa8zG3Rxs0th+hCLIuaQg8HlNV5bjgnuU= github.com/dgraph-io/badger v1.6.2 h1:mNw0qs90GVgGGWylh0umH5iag1j6n/PeJtNvL6KY/x8= github.com/dgraph-io/badger v1.6.2/go.mod h1:JW2yswe3V058sS0kZ2h/AXeDSqFjxnZcRrVH//y2UQE= @@ -226,7 +222,6 @@ github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-kit/kit v0.8.0 h1:Wz+5lgoB0kkuqLEc6NVmwRknTKP6dTGbSqvhZtBI/j0= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0 h1:dXFJfIHVvUcpSgDOV+Ne6t7jXri8Tfv2uOLHUZ2XNuo= @@ -244,16 +239,13 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 h1:ZgQEtGgCBiWRM39fZuwSd1LwSqqSW0hOdXCYYDX0R3I= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -277,7 +269,6 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= @@ -290,13 +281,11 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= -github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -316,7 +305,6 @@ github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f h1:KMlcu9X58lhTA/KrfX8Bi1LQSO4pzoVjTiL3h4Jk+Zk= @@ -336,7 +324,6 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/gtank/merlin v0.1.1-0.20191105220539-8318aed1a79f h1:8N8XWLZelZNibkhM1FuF+3Ad3YIbgirjdMiVA0eUkaM= github.com/gtank/merlin v0.1.1-0.20191105220539-8318aed1a79f/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= github.com/gtank/merlin v0.1.1 h1:eQ90iG7K9pOhtereWsmyRJ6RAwcP4tHTDBHXNg+u5is= github.com/gtank/merlin v0.1.1/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= @@ -367,7 +354,6 @@ github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= @@ -379,7 +365,6 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hdevalence/ed25519consensus v0.0.0-20201207055737-7fde80a9d5ff h1:LeVKjw8pcDQj7WVVnbFvbD7ovcv+r/l15ka1NH6Lswc= github.com/hdevalence/ed25519consensus v0.0.0-20201207055737-7fde80a9d5ff/go.mod h1:Feit0l8NcNO4g69XNjwvsR0LGcwMMfzI1TF253rOIlQ= -github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/huin/goupnp v1.0.0 h1:wg75sLpL6DZqwHQN6E1Cfk6mtfzS45z8OV+ic+DtHRo= @@ -406,7 +391,6 @@ github.com/ipfs/go-blockservice v0.0.7/go.mod h1:EOfb9k/Y878ZTRY/CH0x5+ATtaipfbR github.com/ipfs/go-blockservice v0.1.0/go.mod h1:hzmMScl1kXHg3M2BjTymbVPjv627N7sYcvYaKbop39M= github.com/ipfs/go-blockservice v0.1.1/go.mod h1:t+411r7psEUhLueM8C7aPA7cxCclv4O3VsUVxt9kz2I= github.com/ipfs/go-blockservice v0.1.2/go.mod h1:t+411r7psEUhLueM8C7aPA7cxCclv4O3VsUVxt9kz2I= -github.com/ipfs/go-blockservice v0.1.3 h1:9XgsPMwwWJSC9uVr2pMDsW2qFTBSkxpGMhmna8mIjPM= github.com/ipfs/go-blockservice v0.1.3/go.mod h1:OTZhFpkgY48kNzbgyvcexW9cHrpjBYIjSR0KoDOFOLU= github.com/ipfs/go-blockservice v0.1.4 h1:Vq+MlsH8000KbbUciRyYMEw/NNP8UAGmcqKi4uWmFGA= github.com/ipfs/go-blockservice v0.1.4/go.mod h1:OTZhFpkgY48kNzbgyvcexW9cHrpjBYIjSR0KoDOFOLU= @@ -501,7 +485,6 @@ github.com/ipfs/go-ipfs-util v0.0.2 h1:59Sswnk1MFaiq+VcaknX7aYEyGyGDAA73ilhEK2PO github.com/ipfs/go-ipfs-util v0.0.2/go.mod h1:CbPtkWJzjLdEcezDns2XYaehFVNXG9zrdrtMecczcsQ= github.com/ipfs/go-ipld-cbor v0.0.2/go.mod h1:wTBtrQZA3SoFKMVkp6cn6HMRteIB1VsmHA0AQFOn7Nc= github.com/ipfs/go-ipld-cbor v0.0.3/go.mod h1:wTBtrQZA3SoFKMVkp6cn6HMRteIB1VsmHA0AQFOn7Nc= -github.com/ipfs/go-ipld-cbor v0.0.4 h1:Aw3KPOKXjvrm6VjwJvFf1F1ekR/BH3jdof3Bk7OTiSA= github.com/ipfs/go-ipld-cbor v0.0.4/go.mod h1:BkCduEx3XBCO6t2Sfo5BaHzuok7hbhdMm9Oh8B2Ftq4= github.com/ipfs/go-ipld-cbor v0.0.5 h1:ovz4CHKogtG2KB/h1zUp5U0c/IzZrL435rCh5+K/5G8= github.com/ipfs/go-ipld-cbor v0.0.5/go.mod h1:BkCduEx3XBCO6t2Sfo5BaHzuok7hbhdMm9Oh8B2Ftq4= @@ -610,9 +593,7 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv github.com/koron/go-ssdp v0.0.0-20180514024734-4a0ed625a78b/go.mod h1:5Ky9EC2xfoUKUor0Hjgi2BJhCSXJfMOFlmyYrVKGQMk= github.com/koron/go-ssdp v0.0.0-20191105050749-2e1c40ed0b5d h1:68u9r4wEvL3gYg2jvAOgROwZ3H+Y3hIDk4tbbmIjcYQ= github.com/koron/go-ssdp v0.0.0-20191105050749-2e1c40ed0b5d/go.mod h1:5Ky9EC2xfoUKUor0Hjgi2BJhCSXJfMOFlmyYrVKGQMk= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -625,8 +606,9 @@ github.com/lazyledger/go-leopard v0.0.0-20200604113236-298f93361181 h1:mUeCGuCgj github.com/lazyledger/go-leopard v0.0.0-20200604113236-298f93361181/go.mod h1:v1o1CRihQ9i7hizx23KK4aR79lxA6VDUIzUCfDva0XQ= github.com/lazyledger/merkletree v0.0.0-20201214195110-6901c4c3c75f h1:jbyPAH6o6hGte4RtZBaqWs2n4Fl6hS7qJGXX3qnjiy4= github.com/lazyledger/merkletree v0.0.0-20201214195110-6901c4c3c75f/go.mod h1:10PA0NlnYtB8HrtwIDQAyTKWp8TEZ0zBZCGlYC/7+QE= -github.com/lazyledger/nmt v0.2.0 h1:jKpC+XMSc4P1asLvutSwyMlgUDnAvv1HAVyzal21MbA= github.com/lazyledger/nmt v0.2.0/go.mod h1:tY7ypPX26Sbkt6F8EbPl3AT33B5N0BJe4OVPbq849YI= +github.com/lazyledger/nmt v0.2.1-0.20210311211820-a5c8085cd40d h1:/4e9eoYm9qQLoTczb2QCMDQvGrER14HnPdwPzi2ngv4= +github.com/lazyledger/nmt v0.2.1-0.20210311211820-a5c8085cd40d/go.mod h1:tY7ypPX26Sbkt6F8EbPl3AT33B5N0BJe4OVPbq849YI= github.com/lazyledger/rsmt2d v0.0.0-20201215203123-e5ec7910ddd4 h1:r2mI8AnDTOSwL9GWGjgHC4rwzaR56jRCo1GLpG2lwIw= github.com/lazyledger/rsmt2d v0.0.0-20201215203123-e5ec7910ddd4/go.mod h1:ORR2U7THCNr1fpUhwYqZN7QCFJ20iR2uiIWfXKz3KJ4= github.com/libp2p/go-addr-util v0.0.1/go.mod h1:4ac6O7n9rIAKB1dnd+s8IbbMXkt+oBpzX4/+RACcnlQ= @@ -700,7 +682,6 @@ github.com/libp2p/go-libp2p-core v0.5.5/go.mod h1:vj3awlOr9+GMZJFH9s4mpt9RHHgGqe github.com/libp2p/go-libp2p-core v0.5.6/go.mod h1:txwbVEhHEXikXn9gfC7/UDDw7rkxuX0bJvM49Ykaswo= github.com/libp2p/go-libp2p-core v0.5.7/go.mod h1:txwbVEhHEXikXn9gfC7/UDDw7rkxuX0bJvM49Ykaswo= github.com/libp2p/go-libp2p-core v0.6.0/go.mod h1:txwbVEhHEXikXn9gfC7/UDDw7rkxuX0bJvM49Ykaswo= -github.com/libp2p/go-libp2p-core v0.6.1 h1:XS+Goh+QegCDojUZp00CaPMfiEADCrLjNZskWE7pvqs= github.com/libp2p/go-libp2p-core v0.6.1/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8= github.com/libp2p/go-libp2p-core v0.7.0 h1:4a0TMjrWNTZlNvcqxZmrMRDi/NQWrhwO2pkTuLSQ/IQ= github.com/libp2p/go-libp2p-core v0.7.0/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8= @@ -746,7 +727,6 @@ github.com/libp2p/go-libp2p-net v0.0.2/go.mod h1:Yt3zgmlsHOgUWSXmt5V/Jpz9upuJBE8 github.com/libp2p/go-libp2p-netutil v0.0.1/go.mod h1:GdusFvujWZI9Vt0X5BKqwWWmZFxecf9Gt03cKxm2f/Q= github.com/libp2p/go-libp2p-netutil v0.1.0 h1:zscYDNVEcGxyUpMd0JReUZTrpMfia8PmLKcKF72EAMQ= github.com/libp2p/go-libp2p-netutil v0.1.0/go.mod h1:3Qv/aDqtMLTUyQeundkKsA+YCThNdbQD54k3TqjpbFU= -github.com/libp2p/go-libp2p-noise v0.1.1 h1:vqYQWvnIcHpIoWJKC7Al4D6Hgj0H012TuXRhPwSMGpQ= github.com/libp2p/go-libp2p-noise v0.1.1/go.mod h1:QDFLdKX7nluB7DEnlVPbz7xlLHdwHFA9HiohJRr3vwM= github.com/libp2p/go-libp2p-noise v0.1.2 h1:IH9GRihQJTx56obm+GnpdPX4KeVIlvpXrP6xnJ0wxWk= github.com/libp2p/go-libp2p-noise v0.1.2/go.mod h1:9B10b7ueo7TIxZHHcjcDCo5Hd6kfKT2m77by82SFRfE= @@ -793,7 +773,6 @@ github.com/libp2p/go-libp2p-swarm v0.0.6/go.mod h1:s5GZvzg9xXe8sbeESuFpjt8CJPTCa github.com/libp2p/go-libp2p-swarm v0.1.0/go.mod h1:wQVsCdjsuZoc730CgOvh5ox6K8evllckjebkdiY5ta4= github.com/libp2p/go-libp2p-swarm v0.2.2/go.mod h1:fvmtQ0T1nErXym1/aa1uJEyN7JzaTNyBcHImCxRpPKU= github.com/libp2p/go-libp2p-swarm v0.2.3/go.mod h1:P2VO/EpxRyDxtChXz/VPVXyTnszHvokHKRhfkEgFKNM= -github.com/libp2p/go-libp2p-swarm v0.2.8 h1:cIUUvytBzNQmGSjnXFlI6UpoBGsaud82mJPIJVfkDlg= github.com/libp2p/go-libp2p-swarm v0.2.8/go.mod h1:JQKMGSth4SMqonruY0a8yjlPVIkb0mdNSwckW7OYziM= github.com/libp2p/go-libp2p-swarm v0.3.0/go.mod h1:hdv95GWCTmzkgeJpP+GK/9D9puJegb7H57B5hWQR5Kk= github.com/libp2p/go-libp2p-swarm v0.3.1 h1:UTobu+oQHGdXTOGpZ4RefuVqYoJXcT0EBtSR74m2LkI= @@ -823,7 +802,6 @@ github.com/libp2p/go-libp2p-yamux v0.2.1/go.mod h1:1FBXiHDk1VyRM1C0aez2bCfHQ4vMZ github.com/libp2p/go-libp2p-yamux v0.2.2/go.mod h1:lIohaR0pT6mOt0AZ0L2dFze9hds9Req3OfS+B+dv4qw= github.com/libp2p/go-libp2p-yamux v0.2.5/go.mod h1:Zpgj6arbyQrmZ3wxSZxfBmbdnWtbZ48OpsfmQVTErwA= github.com/libp2p/go-libp2p-yamux v0.2.7/go.mod h1:X28ENrBMU/nm4I3Nx4sZ4dgjZ6VhLEn0XhIoZ5viCwU= -github.com/libp2p/go-libp2p-yamux v0.2.8 h1:0s3ELSLu2O7hWKfX1YjzudBKCP0kZ+m9e2+0veXzkn4= github.com/libp2p/go-libp2p-yamux v0.2.8/go.mod h1:/t6tDqeuZf0INZMTgd0WxIRbtK2EzI2h7HbFm9eAKI4= github.com/libp2p/go-libp2p-yamux v0.4.0 h1:qunEZzWwwmfSBYTtSyd81PlD1TjB5uuWcGYHWVXLbUg= github.com/libp2p/go-libp2p-yamux v0.4.0/go.mod h1:+DWDjtFMzoAwYLVkNZftoucn7PelNoy5nm3tZ3/Zw30= @@ -835,7 +813,6 @@ github.com/libp2p/go-mplex v0.0.3/go.mod h1:pK5yMLmOoBR1pNCqDlA2GQrdAVTMkqFalaTW github.com/libp2p/go-mplex v0.0.4/go.mod h1:pK5yMLmOoBR1pNCqDlA2GQrdAVTMkqFalaTWe7l4Yd0= github.com/libp2p/go-mplex v0.1.0/go.mod h1:SXgmdki2kwCUlCCbfGLEgHjC4pFqhTp0ZoV6aiKgxDU= github.com/libp2p/go-mplex v0.1.1/go.mod h1:Xgz2RDCi3co0LeZfgjm4OgUF15+sVR8SRcu3SFXI1lk= -github.com/libp2p/go-mplex v0.1.2 h1:qOg1s+WdGLlpkrczDqmhYzyk3vCfsQ8+RxRTQjOZWwI= github.com/libp2p/go-mplex v0.1.2/go.mod h1:Xgz2RDCi3co0LeZfgjm4OgUF15+sVR8SRcu3SFXI1lk= github.com/libp2p/go-mplex v0.2.0 h1:Ov/D+8oBlbRkjBs1R1Iua8hJ8cUfbdiW8EOdZuxcgaI= github.com/libp2p/go-mplex v0.2.0/go.mod h1:0Oy/A9PQlwBytDRp4wSkFnzHYDKcpLot35JQ6msjvYQ= @@ -893,7 +870,6 @@ github.com/libp2p/go-yamux v1.2.3/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZ github.com/libp2p/go-yamux v1.3.0/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow= github.com/libp2p/go-yamux v1.3.3/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow= github.com/libp2p/go-yamux v1.3.5/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow= -github.com/libp2p/go-yamux v1.3.7 h1:v40A1eSPJDIZwz2AvrV3cxpTZEGDP11QJbukmEhYyQI= github.com/libp2p/go-yamux v1.3.7/go.mod h1:fr7aVgmdNGJK+N1g+b6DW6VxzbRCjCOejR/hkmpooHE= github.com/libp2p/go-yamux v1.4.0 h1:7nqe0T95T2CWh40IdJ/tp8RMor4ubc9/wYZpB2a/Hx0= github.com/libp2p/go-yamux v1.4.0/go.mod h1:fr7aVgmdNGJK+N1g+b6DW6VxzbRCjCOejR/hkmpooHE= @@ -1046,7 +1022,6 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= @@ -1057,7 +1032,6 @@ github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWEr github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= @@ -1100,7 +1074,6 @@ github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeD github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.8.0 h1:zvJNkoCFAnYFNC24FV8nW4JdRJ3GIFcLbg65lL/JDcw= github.com/prometheus/client_golang v1.8.0/go.mod h1:O9VU6huf47PktckDQfMTX0Y8tY0/7TSWwj+ITvv0TnM= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -1119,7 +1092,6 @@ github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB8 github.com/prometheus/common v0.14.0 h1:RHRyE8UocrbjU+6UvRzwi6HjiDfxrrBU91TtbKzkGp4= github.com/prometheus/common v0.14.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d h1:GoAlyOgbOEIFdaDqxJVlbOQ1DtGmZWs/Qau0hIlk+WQ= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1175,7 +1147,6 @@ github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5k github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= 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/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/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= github.com/smartystreets/assertions v1.0.1 h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w= @@ -1228,7 +1199,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -1278,7 +1248,6 @@ github.com/whyrusleeping/mdns v0.0.0-20190826153040-b9b60ed33aa9 h1:Y1/FEOpaCpD2 github.com/whyrusleeping/mdns v0.0.0-20190826153040-b9b60ed33aa9/go.mod h1:j4l84WPFclQPj320J9gp0XwNKBb3U0zt5CBqjPp22G4= github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 h1:E9S12nwJwEOXe2d6gT6qxdvqMnNq+VnSsKPgm2ZZNds= github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7/go.mod h1:X2c0RVCI1eSUFI8eLcY3c0423ykwiUdxLJtkDvruhjI= -github.com/whyrusleeping/tar-utils v0.0.0-20180509141711-8c6c8ba81d5c h1:GGsyl0dZ2jJgVT+VvWBf/cNijrHRhkrTjkmp5wg7li0= github.com/whyrusleeping/tar-utils v0.0.0-20180509141711-8c6c8ba81d5c/go.mod h1:xxcJeBb7SIUl/Wzkz1eVKJE/CB34YNrqX2TQI6jY9zs= github.com/whyrusleeping/tar-utils v0.0.0-20201201191210-20a61371de5b h1:wA3QeTsaAXybLL2kb2cKhCAQTHgYTMwuI8lBlJSv5V8= github.com/whyrusleeping/tar-utils v0.0.0-20201201191210-20a61371de5b/go.mod h1:xT1Y5p2JR2PfSZihE0s4mjdJaRGp1waCTf5JzhQLBck= @@ -1307,7 +1276,6 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= @@ -1333,7 +1301,6 @@ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9E go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= -go.uber.org/zap v1.15.0 h1:ZZCA22JRF2gQE5FoNmhmrf7jeJJ2uhqDUNRYKm8dvmM= go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= @@ -1367,7 +1334,6 @@ golang.org/x/crypto v0.0.0-20200117160349-530e935923ad/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY= @@ -1379,7 +1345,6 @@ golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136 h1:A1gGSx58LAGVHUUsOf7IiR0u8Xb6W51gRwfDBhkdcaw= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= @@ -1407,7 +1372,6 @@ golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKG golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -1447,7 +1411,6 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc h1:zK/HqS5bZxDptfPJNq8v7vJfXtkU7r9TLIoSr1bXaP4= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -1459,14 +1422,12 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03iWnKLEWinaScsxF2Vm2o= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck= @@ -1524,14 +1485,12 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed h1:J22ig1FUekjjkmZUM7pTKixYm8DvrYsvrBZdunYeIuQ= golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211 h1:9UQO31fZ+0aKQOFldThf7BKPMJTiBfWycGh/u3UoO88= golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -1661,10 +1620,8 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEGA= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= @@ -1690,7 +1647,6 @@ gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRN gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/proto/tendermint/types/canonical.pb.go b/proto/tendermint/types/canonical.pb.go index 41ff727121..e56c52d78c 100644 --- a/proto/tendermint/types/canonical.pb.go +++ b/proto/tendermint/types/canonical.pb.go @@ -133,13 +133,13 @@ func (m *CanonicalPartSetHeader) GetHash() []byte { } type CanonicalProposal struct { - Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` - Height int64 `protobuf:"fixed64,2,opt,name=height,proto3" json:"height,omitempty"` - Round int64 `protobuf:"fixed64,3,opt,name=round,proto3" json:"round,omitempty"` - POLRound int64 `protobuf:"varint,4,opt,name=pol_round,json=polRound,proto3" json:"pol_round,omitempty"` - BlockID *CanonicalBlockID `protobuf:"bytes,5,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` - Timestamp time.Time `protobuf:"bytes,6,opt,name=timestamp,proto3,stdtime" json:"timestamp"` - ChainID string `protobuf:"bytes,7,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` + Height int64 `protobuf:"fixed64,2,opt,name=height,proto3" json:"height,omitempty"` + Round int64 `protobuf:"fixed64,3,opt,name=round,proto3" json:"round,omitempty"` + POLRound int64 `protobuf:"varint,4,opt,name=pol_round,json=polRound,proto3" json:"pol_round,omitempty"` + DAHeader DataAvailabilityHeader `protobuf:"bytes,5,opt,name=da_header,json=daHeader,proto3" json:"da_header"` + Timestamp time.Time `protobuf:"bytes,6,opt,name=timestamp,proto3,stdtime" json:"timestamp"` + ChainID string `protobuf:"bytes,7,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` } func (m *CanonicalProposal) Reset() { *m = CanonicalProposal{} } @@ -203,11 +203,11 @@ func (m *CanonicalProposal) GetPOLRound() int64 { return 0 } -func (m *CanonicalProposal) GetBlockID() *CanonicalBlockID { +func (m *CanonicalProposal) GetDAHeader() DataAvailabilityHeader { if m != nil { - return m.BlockID + return m.DAHeader } - return nil + return DataAvailabilityHeader{} } func (m *CanonicalProposal) GetTimestamp() time.Time { @@ -318,39 +318,41 @@ func init() { func init() { proto.RegisterFile("tendermint/types/canonical.proto", fileDescriptor_8d1a1a84ff7267ed) } var fileDescriptor_8d1a1a84ff7267ed = []byte{ - // 498 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x53, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0x8d, 0x53, 0x27, 0x71, 0xb6, 0x0d, 0x84, 0x55, 0x55, 0x59, 0x11, 0xb2, 0x2d, 0x1f, 0x90, - 0x39, 0x60, 0x4b, 0xed, 0x95, 0x93, 0xcb, 0x81, 0x20, 0x10, 0x95, 0x5b, 0xe5, 0xc0, 0x25, 0xda, - 0xd8, 0x8b, 0x6d, 0xb1, 0xf1, 0xae, 0xd6, 0x9b, 0x43, 0x38, 0xf0, 0x1b, 0xfa, 0x3b, 0xf8, 0x25, - 0x3d, 0xf6, 0x08, 0x97, 0x80, 0x9c, 0x3f, 0x82, 0x76, 0xed, 0x7c, 0xa8, 0x05, 0x2e, 0xa0, 0x5e, - 0xac, 0x99, 0x37, 0xcf, 0x6f, 0x9e, 0xde, 0x68, 0x81, 0x23, 0x70, 0x91, 0x60, 0x3e, 0xcf, 0x0b, - 0x11, 0x88, 0x25, 0xc3, 0x65, 0x10, 0xa3, 0x82, 0x16, 0x79, 0x8c, 0x88, 0xcf, 0x38, 0x15, 0x14, - 0x0e, 0x77, 0x0c, 0x5f, 0x31, 0x46, 0xc7, 0x29, 0x4d, 0xa9, 0x1a, 0x06, 0xb2, 0xaa, 0x79, 0xa3, - 0xa7, 0xf7, 0x94, 0xd4, 0xb7, 0x99, 0xda, 0x29, 0xa5, 0x29, 0xc1, 0x81, 0xea, 0x66, 0x8b, 0x8f, - 0x81, 0xc8, 0xe7, 0xb8, 0x14, 0x68, 0xce, 0x6a, 0x82, 0xfb, 0x05, 0x0c, 0xcf, 0x37, 0x9b, 0x43, - 0x42, 0xe3, 0x4f, 0xe3, 0x57, 0x10, 0x02, 0x3d, 0x43, 0x65, 0x66, 0x6a, 0x8e, 0xe6, 0x1d, 0x45, - 0xaa, 0x86, 0x13, 0xf0, 0x98, 0x21, 0x2e, 0xa6, 0x25, 0x16, 0xd3, 0x0c, 0xa3, 0x04, 0x73, 0xb3, - 0xed, 0x68, 0xde, 0xe1, 0xa9, 0xe7, 0xdf, 0x35, 0xea, 0x6f, 0x05, 0x2f, 0x10, 0x17, 0x97, 0x58, - 0xbc, 0x56, 0xfc, 0x50, 0xbf, 0x59, 0xd9, 0xad, 0x68, 0xc0, 0xf6, 0x41, 0x37, 0x04, 0x27, 0xbf, - 0xa7, 0xc3, 0x63, 0xd0, 0x11, 0x54, 0x20, 0xa2, 0x6c, 0x0c, 0xa2, 0xba, 0xd9, 0x7a, 0x6b, 0xef, - 0xbc, 0xb9, 0xdf, 0xdb, 0xe0, 0xc9, 0x4e, 0x84, 0x53, 0x46, 0x4b, 0x44, 0xe0, 0x19, 0xd0, 0xa5, - 0x1d, 0xf5, 0xfb, 0xa3, 0x53, 0xfb, 0xbe, 0xcd, 0xcb, 0x3c, 0x2d, 0x70, 0xf2, 0xae, 0x4c, 0xaf, - 0x96, 0x0c, 0x47, 0x8a, 0x0c, 0x4f, 0x40, 0x37, 0xc3, 0x79, 0x9a, 0x09, 0xb5, 0x60, 0x18, 0x35, - 0x9d, 0x34, 0xc3, 0xe9, 0xa2, 0x48, 0xcc, 0x03, 0x05, 0xd7, 0x0d, 0x7c, 0x0e, 0xfa, 0x8c, 0x92, - 0x69, 0x3d, 0xd1, 0x1d, 0xcd, 0x3b, 0x08, 0x8f, 0xaa, 0x95, 0x6d, 0x5c, 0xbc, 0x7f, 0x1b, 0x49, - 0x2c, 0x32, 0x18, 0x25, 0xaa, 0x82, 0x6f, 0x80, 0x31, 0x93, 0xf1, 0x4e, 0xf3, 0xc4, 0xec, 0xa8, - 0xe0, 0xdc, 0xbf, 0x04, 0xd7, 0x5c, 0x22, 0x3c, 0xac, 0x56, 0x76, 0xaf, 0x69, 0xa2, 0x9e, 0x12, - 0x18, 0x27, 0x30, 0x04, 0xfd, 0xed, 0x19, 0xcd, 0xae, 0x12, 0x1b, 0xf9, 0xf5, 0xa1, 0xfd, 0xcd, - 0xa1, 0xfd, 0xab, 0x0d, 0x23, 0x34, 0x64, 0xee, 0xd7, 0x3f, 0x6c, 0x2d, 0xda, 0xfd, 0x06, 0x9f, - 0x01, 0x23, 0xce, 0x50, 0x5e, 0x48, 0x3f, 0x3d, 0x47, 0xf3, 0xfa, 0xf5, 0xae, 0x73, 0x89, 0xc9, - 0x5d, 0x6a, 0x38, 0x4e, 0xdc, 0xaf, 0x6d, 0x30, 0xd8, 0xda, 0x9a, 0x50, 0x81, 0x1f, 0x22, 0xd7, - 0xfd, 0xb0, 0xf4, 0xff, 0x19, 0x56, 0xe7, 0xdf, 0xc3, 0xea, 0xfe, 0x39, 0xac, 0x70, 0x72, 0x53, - 0x59, 0xda, 0x6d, 0x65, 0x69, 0x3f, 0x2b, 0x4b, 0xbb, 0x5e, 0x5b, 0xad, 0xdb, 0xb5, 0xd5, 0xfa, - 0xb6, 0xb6, 0x5a, 0x1f, 0x5e, 0xa6, 0xb9, 0xc8, 0x16, 0x33, 0x3f, 0xa6, 0xf3, 0x80, 0xa0, 0xcf, - 0x4b, 0x82, 0x93, 0x14, 0xf3, 0xbd, 0xf2, 0x45, 0x4c, 0x79, 0xf3, 0x4c, 0x83, 0xbb, 0x2f, 0x7a, - 0xd6, 0x55, 0xf8, 0xd9, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xcc, 0xa8, 0xca, 0x68, 0x36, 0x04, - 0x00, 0x00, + // 536 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x53, 0x4f, 0x6f, 0xd3, 0x3e, + 0x18, 0x6e, 0xba, 0xfe, 0x49, 0xbd, 0xf5, 0xf7, 0x2b, 0xd6, 0x34, 0x55, 0x15, 0x4a, 0xaa, 0x1e, + 0x50, 0x38, 0x90, 0x48, 0xdb, 0x95, 0xcb, 0xb2, 0x1e, 0x28, 0x02, 0x31, 0x79, 0x53, 0x91, 0xb8, + 0x54, 0x4e, 0x6c, 0x12, 0x0b, 0x37, 0x8e, 0x12, 0x17, 0xa9, 0x1c, 0xf8, 0x0c, 0xfb, 0x1c, 0x7c, + 0x92, 0x1d, 0x77, 0xe4, 0x54, 0x50, 0x2a, 0xf1, 0x39, 0x90, 0x9d, 0xb4, 0x1d, 0x1b, 0xe3, 0x82, + 0xc4, 0x25, 0x7a, 0xdf, 0xe7, 0x7d, 0xf2, 0xf8, 0xf1, 0x63, 0x1b, 0x0c, 0x25, 0x4d, 0x08, 0xcd, + 0xe6, 0x2c, 0x91, 0x9e, 0x5c, 0xa6, 0x34, 0xf7, 0x42, 0x9c, 0x88, 0x84, 0x85, 0x98, 0xbb, 0x69, + 0x26, 0xa4, 0x80, 0xbd, 0x1d, 0xc3, 0xd5, 0x8c, 0xc1, 0x61, 0x24, 0x22, 0xa1, 0x87, 0x9e, 0xaa, + 0x4a, 0xde, 0xe0, 0xf1, 0x3d, 0x25, 0xfd, 0xad, 0xa6, 0x76, 0x24, 0x44, 0xc4, 0xa9, 0xa7, 0xbb, + 0x60, 0xf1, 0xde, 0x93, 0x6c, 0x4e, 0x73, 0x89, 0xe7, 0x69, 0x49, 0x18, 0x7d, 0x06, 0xbd, 0xb3, + 0xcd, 0xca, 0x3e, 0x17, 0xe1, 0x87, 0xc9, 0x18, 0x42, 0xd0, 0x88, 0x71, 0x1e, 0xf7, 0x8d, 0xa1, + 0xe1, 0x1c, 0x20, 0x5d, 0xc3, 0x29, 0xf8, 0x3f, 0xc5, 0x99, 0x9c, 0xe5, 0x54, 0xce, 0x62, 0x8a, + 0x09, 0xcd, 0xfa, 0xf5, 0xa1, 0xe1, 0xec, 0x1f, 0x3b, 0xee, 0x5d, 0xa3, 0xee, 0x56, 0xf0, 0x1c, + 0x67, 0xf2, 0x82, 0xca, 0x17, 0x9a, 0xef, 0x37, 0xae, 0x57, 0x76, 0x0d, 0x75, 0xd3, 0xdb, 0xe0, + 0xc8, 0x07, 0x47, 0xbf, 0xa7, 0xc3, 0x43, 0xd0, 0x94, 0x42, 0x62, 0xae, 0x6d, 0x74, 0x51, 0xd9, + 0x6c, 0xbd, 0xd5, 0x77, 0xde, 0x46, 0x3f, 0xea, 0xe0, 0xd1, 0x4e, 0x24, 0x13, 0xa9, 0xc8, 0x31, + 0x87, 0x27, 0xa0, 0xa1, 0xec, 0xe8, 0xdf, 0xff, 0x3b, 0xb6, 0xef, 0xdb, 0xbc, 0x60, 0x51, 0x42, + 0xc9, 0xeb, 0x3c, 0xba, 0x5c, 0xa6, 0x14, 0x69, 0x32, 0x3c, 0x02, 0xad, 0x98, 0xb2, 0x28, 0x96, + 0x7a, 0x81, 0x1e, 0xaa, 0x3a, 0x65, 0x26, 0x13, 0x8b, 0x84, 0xf4, 0xf7, 0x34, 0x5c, 0x36, 0xf0, + 0x29, 0xe8, 0xa4, 0x82, 0xcf, 0xca, 0x49, 0x63, 0x68, 0x38, 0x7b, 0xfe, 0x41, 0xb1, 0xb2, 0xcd, + 0xf3, 0x37, 0xaf, 0x90, 0xc2, 0x90, 0x99, 0x0a, 0xae, 0x2b, 0xf8, 0x16, 0x74, 0x08, 0xde, 0x24, + 0xd7, 0x7c, 0x28, 0xb9, 0x31, 0x96, 0xf8, 0xf4, 0x23, 0x66, 0x1c, 0x07, 0x8c, 0x33, 0xb9, 0xac, + 0x92, 0xeb, 0xa9, 0xe4, 0x94, 0xf0, 0xf8, 0xb4, 0x44, 0x90, 0x49, 0x70, 0x15, 0x93, 0x0f, 0x3a, + 0xdb, 0x33, 0xed, 0xb7, 0xb4, 0xf0, 0xc0, 0x2d, 0x4f, 0xdd, 0xdd, 0x9c, 0xba, 0x7b, 0xb9, 0x61, + 0xf8, 0xa6, 0x92, 0xba, 0xfa, 0x66, 0x1b, 0x68, 0xf7, 0x1b, 0x7c, 0x02, 0xcc, 0x30, 0xc6, 0x2c, + 0x99, 0x31, 0xd2, 0x6f, 0x0f, 0x0d, 0xa7, 0xe3, 0xef, 0x17, 0x2b, 0xbb, 0x7d, 0xa6, 0xb0, 0xc9, + 0x18, 0xb5, 0xf5, 0x70, 0x42, 0x46, 0x5f, 0xea, 0xa0, 0xbb, 0x0d, 0x7a, 0x2a, 0x24, 0xfd, 0x17, + 0x21, 0xbf, 0x04, 0x66, 0xa0, 0x2e, 0xa6, 0x32, 0xd7, 0xd0, 0xfb, 0x1b, 0xfd, 0xe1, 0xca, 0x55, + 0x77, 0xb8, 0xdc, 0x40, 0xd5, 0xa0, 0xb6, 0x16, 0x98, 0x90, 0x5f, 0xc3, 0x6a, 0xfe, 0x7d, 0x58, + 0xad, 0x87, 0xc3, 0xf2, 0xa7, 0xd7, 0x85, 0x65, 0xdc, 0x14, 0x96, 0xf1, 0xbd, 0xb0, 0x8c, 0xab, + 0xb5, 0x55, 0xbb, 0x59, 0x5b, 0xb5, 0xaf, 0x6b, 0xab, 0xf6, 0xee, 0x79, 0xc4, 0x64, 0xbc, 0x08, + 0xdc, 0x50, 0xcc, 0x3d, 0x8e, 0x3f, 0x2d, 0x39, 0x25, 0x11, 0xcd, 0x6e, 0x95, 0xcf, 0x42, 0x91, + 0x55, 0x6f, 0xd6, 0xbb, 0xfb, 0xbc, 0x83, 0x96, 0xc6, 0x4f, 0x7e, 0x06, 0x00, 0x00, 0xff, 0xff, + 0x39, 0x76, 0xa7, 0x87, 0x43, 0x04, 0x00, 0x00, } func (m *CanonicalBlockID) Marshal() (dAtA []byte, err error) { @@ -463,18 +465,16 @@ func (m *CanonicalProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintCanonical(dAtA, i, uint64(n2)) i-- dAtA[i] = 0x32 - if m.BlockID != nil { - { - size, err := m.BlockID.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintCanonical(dAtA, i, uint64(size)) + { + size, err := m.DAHeader.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i-- - dAtA[i] = 0x2a + i -= size + i = encodeVarintCanonical(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x2a if m.POLRound != 0 { i = encodeVarintCanonical(dAtA, i, uint64(m.POLRound)) i-- @@ -627,10 +627,8 @@ func (m *CanonicalProposal) Size() (n int) { if m.POLRound != 0 { n += 1 + sovCanonical(uint64(m.POLRound)) } - if m.BlockID != nil { - l = m.BlockID.Size() - n += 1 + l + sovCanonical(uint64(l)) - } + l = m.DAHeader.Size() + n += 1 + l + sovCanonical(uint64(l)) l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp) n += 1 + l + sovCanonical(uint64(l)) l = len(m.ChainID) @@ -983,7 +981,7 @@ func (m *CanonicalProposal) Unmarshal(dAtA []byte) error { } case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field BlockID", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field DAHeader", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -1010,10 +1008,7 @@ func (m *CanonicalProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.BlockID == nil { - m.BlockID = &CanonicalBlockID{} - } - if err := m.BlockID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.DAHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/proto/tendermint/types/canonical.proto b/proto/tendermint/types/canonical.proto index 8788de6dad..7d0052fb8f 100644 --- a/proto/tendermint/types/canonical.proto +++ b/proto/tendermint/types/canonical.proto @@ -22,7 +22,7 @@ message CanonicalProposal { sfixed64 height = 2; // canonicalization requires fixed size encoding here sfixed64 round = 3; // canonicalization requires fixed size encoding here int64 pol_round = 4 [(gogoproto.customname) = "POLRound"]; - CanonicalBlockID block_id = 5 [(gogoproto.customname) = "BlockID"]; + DataAvailabilityHeader da_header = 5 [(gogoproto.customname) = "DAHeader", (gogoproto.nullable) = false]; google.protobuf.Timestamp timestamp = 6 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; string chain_id = 7 [(gogoproto.customname) = "ChainID"]; } diff --git a/proto/tendermint/types/types.pb.go b/proto/tendermint/types/types.pb.go index 0b554aec3a..96d633ae10 100644 --- a/proto/tendermint/types/types.pb.go +++ b/proto/tendermint/types/types.pb.go @@ -1215,13 +1215,13 @@ func (m *CommitSig) GetSignature() []byte { } type Proposal struct { - Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` - Height int64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` - Round int32 `protobuf:"varint,3,opt,name=round,proto3" json:"round,omitempty"` - PolRound int32 `protobuf:"varint,4,opt,name=pol_round,json=polRound,proto3" json:"pol_round,omitempty"` - BlockID BlockID `protobuf:"bytes,5,opt,name=block_id,json=blockId,proto3" json:"block_id"` - Timestamp time.Time `protobuf:"bytes,6,opt,name=timestamp,proto3,stdtime" json:"timestamp"` - Signature []byte `protobuf:"bytes,7,opt,name=signature,proto3" json:"signature,omitempty"` + Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` + Height int64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` + Round int32 `protobuf:"varint,3,opt,name=round,proto3" json:"round,omitempty"` + PolRound int32 `protobuf:"varint,4,opt,name=pol_round,json=polRound,proto3" json:"pol_round,omitempty"` + DAHeader DataAvailabilityHeader `protobuf:"bytes,5,opt,name=da_header,json=daHeader,proto3" json:"da_header"` + Timestamp time.Time `protobuf:"bytes,6,opt,name=timestamp,proto3,stdtime" json:"timestamp"` + Signature []byte `protobuf:"bytes,7,opt,name=signature,proto3" json:"signature,omitempty"` } func (m *Proposal) Reset() { *m = Proposal{} } @@ -1285,11 +1285,11 @@ func (m *Proposal) GetPolRound() int32 { return 0 } -func (m *Proposal) GetBlockID() BlockID { +func (m *Proposal) GetDAHeader() DataAvailabilityHeader { if m != nil { - return m.BlockID + return m.DAHeader } - return BlockID{} + return DataAvailabilityHeader{} } func (m *Proposal) GetTimestamp() time.Time { @@ -1568,119 +1568,120 @@ func init() { func init() { proto.RegisterFile("tendermint/types/types.proto", fileDescriptor_d3a6e55e2345de56) } var fileDescriptor_d3a6e55e2345de56 = []byte{ - // 1786 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4b, 0x6f, 0x1b, 0xc9, - 0x11, 0xd6, 0x90, 0x94, 0x48, 0x16, 0x49, 0x89, 0xea, 0xc8, 0x32, 0x45, 0xdb, 0x14, 0x33, 0x79, - 0xac, 0xf6, 0x45, 0x39, 0xde, 0x20, 0x48, 0x80, 0xcd, 0x62, 0x49, 0x49, 0x6b, 0x33, 0xab, 0x07, - 0x31, 0xd4, 0x2a, 0x8f, 0xcb, 0xa0, 0xc9, 0x69, 0x93, 0x13, 0x0f, 0xa7, 0x07, 0xd3, 0x4d, 0x59, - 0xf2, 0x31, 0xa7, 0x40, 0x27, 0x9f, 0x72, 0xd3, 0x29, 0x39, 0xe4, 0x9e, 0x3f, 0x10, 0xe4, 0xb4, - 0x97, 0x00, 0x7b, 0x4b, 0x2e, 0xd9, 0x04, 0x76, 0x10, 0xe4, 0x67, 0x04, 0xfd, 0x98, 0xe1, 0x50, - 0x24, 0x1d, 0xc3, 0x30, 0xf6, 0x42, 0xcc, 0x54, 0x7d, 0x5f, 0x77, 0x3d, 0xba, 0xaa, 0x7a, 0x08, - 0x77, 0x39, 0xf1, 0x1d, 0x12, 0x8e, 0x5c, 0x9f, 0xef, 0xf2, 0xcb, 0x80, 0x30, 0xf5, 0xdb, 0x08, - 0x42, 0xca, 0x29, 0x2a, 0x4f, 0xb4, 0x0d, 0x29, 0xaf, 0x6e, 0x0c, 0xe8, 0x80, 0x4a, 0xe5, 0xae, - 0x78, 0x52, 0xb8, 0xea, 0xf6, 0x80, 0xd2, 0x81, 0x47, 0x76, 0xe5, 0x5b, 0x6f, 0xfc, 0x78, 0x97, - 0xbb, 0x23, 0xc2, 0x38, 0x1e, 0x05, 0x1a, 0x70, 0x2f, 0xb1, 0x4d, 0x3f, 0xbc, 0x0c, 0x38, 0x15, - 0x58, 0xfa, 0x58, 0xab, 0x6b, 0x09, 0xf5, 0x39, 0x09, 0x99, 0x4b, 0xfd, 0xa4, 0x1d, 0xd5, 0xfa, - 0x8c, 0x95, 0xe7, 0xd8, 0x73, 0x1d, 0xcc, 0x69, 0xa8, 0x10, 0xe6, 0x4f, 0xa0, 0xd4, 0xc1, 0x21, - 0xef, 0x12, 0xfe, 0x88, 0x60, 0x87, 0x84, 0x68, 0x03, 0x96, 0x39, 0xe5, 0xd8, 0xab, 0x18, 0x75, - 0x63, 0xa7, 0x64, 0xa9, 0x17, 0x84, 0x20, 0x33, 0xc4, 0x6c, 0x58, 0x49, 0xd5, 0x8d, 0x9d, 0xa2, - 0x25, 0x9f, 0xcd, 0x21, 0x64, 0x04, 0x55, 0x30, 0x5c, 0xdf, 0x21, 0x17, 0x11, 0x43, 0xbe, 0x08, - 0x69, 0xef, 0x92, 0x13, 0xa6, 0x29, 0xea, 0x05, 0xfd, 0x10, 0x96, 0xa5, 0xfd, 0x95, 0x74, 0xdd, - 0xd8, 0x29, 0x3c, 0xa8, 0x34, 0x12, 0x81, 0x52, 0xfe, 0x35, 0x3a, 0x42, 0xdf, 0xca, 0x7c, 0xf9, - 0xf5, 0xf6, 0x92, 0xa5, 0xc0, 0xa6, 0x07, 0xd9, 0x96, 0x47, 0xfb, 0x4f, 0xda, 0xfb, 0xb1, 0x21, - 0xc6, 0xc4, 0x10, 0x74, 0x04, 0x6b, 0x01, 0x0e, 0xb9, 0xcd, 0x08, 0xb7, 0x87, 0xd2, 0x0b, 0xb9, - 0x69, 0xe1, 0xc1, 0x76, 0xe3, 0x66, 0x1e, 0x1a, 0x53, 0xce, 0xea, 0x5d, 0x4a, 0x41, 0x52, 0x68, - 0xfe, 0x27, 0x03, 0x2b, 0x3a, 0x18, 0x3f, 0x85, 0xac, 0x0e, 0xab, 0xdc, 0xb0, 0xf0, 0xe0, 0x5e, - 0x72, 0x45, 0xad, 0x6a, 0xec, 0x51, 0x9f, 0x11, 0x9f, 0x8d, 0x99, 0x5e, 0x2f, 0xe2, 0xa0, 0xef, - 0x43, 0xae, 0x3f, 0xc4, 0xae, 0x6f, 0xbb, 0x8e, 0xb4, 0x28, 0xdf, 0x2a, 0xbc, 0xf8, 0x7a, 0x3b, - 0xbb, 0x27, 0x64, 0xed, 0x7d, 0x2b, 0x2b, 0x95, 0x6d, 0x07, 0x6d, 0xc2, 0xca, 0x90, 0xb8, 0x83, - 0x21, 0x97, 0x61, 0x49, 0x5b, 0xfa, 0x0d, 0xfd, 0x18, 0x32, 0xe2, 0x40, 0x54, 0x32, 0x72, 0xef, - 0x6a, 0x43, 0x9d, 0x96, 0x46, 0x74, 0x5a, 0x1a, 0xa7, 0xd1, 0x69, 0x69, 0xe5, 0xc4, 0xc6, 0xcf, - 0xff, 0xb9, 0x6d, 0x58, 0x92, 0x81, 0xf6, 0xa0, 0xe4, 0x61, 0xc6, 0xed, 0x9e, 0x08, 0x9b, 0xd8, - 0x7e, 0x59, 0x2e, 0xb1, 0x35, 0x1b, 0x10, 0x1d, 0x58, 0x6d, 0x7a, 0x41, 0xb0, 0x94, 0xc8, 0x41, - 0x3b, 0x50, 0x96, 0x8b, 0xf4, 0xe9, 0x68, 0xe4, 0x72, 0x5b, 0xc6, 0x7d, 0x45, 0xc6, 0x7d, 0x55, - 0xc8, 0xf7, 0xa4, 0xf8, 0x91, 0xc8, 0xc0, 0x1d, 0xc8, 0x3b, 0x98, 0x63, 0x05, 0xc9, 0x4a, 0x48, - 0x4e, 0x08, 0xa4, 0xf2, 0x1d, 0x58, 0x8b, 0x4f, 0x1d, 0x53, 0x90, 0x9c, 0x5a, 0x65, 0x22, 0x96, - 0xc0, 0xfb, 0xb0, 0xe1, 0x93, 0x0b, 0x6e, 0xdf, 0x44, 0xe7, 0x25, 0x1a, 0x09, 0xdd, 0xd9, 0x34, - 0xe3, 0x7b, 0xb0, 0xda, 0x8f, 0x82, 0xaf, 0xb0, 0x20, 0xb1, 0xa5, 0x58, 0x2a, 0x61, 0x5b, 0x90, - 0xc3, 0x41, 0xa0, 0x00, 0x05, 0x09, 0xc8, 0xe2, 0x20, 0x90, 0xaa, 0xf7, 0x60, 0x5d, 0xfa, 0x18, - 0x12, 0x36, 0xf6, 0xb8, 0x5e, 0xa4, 0x28, 0x31, 0x6b, 0x42, 0x61, 0x29, 0xb9, 0xc4, 0x7e, 0x07, - 0x4a, 0xe4, 0xdc, 0x75, 0x88, 0xdf, 0x27, 0x0a, 0x57, 0x92, 0xb8, 0x62, 0x24, 0x94, 0xa0, 0x77, - 0xa1, 0x1c, 0x84, 0x34, 0xa0, 0x8c, 0x84, 0x36, 0x76, 0x9c, 0x90, 0x30, 0x56, 0x59, 0x55, 0xeb, - 0x45, 0xf2, 0xa6, 0x12, 0x9b, 0xbf, 0x49, 0x41, 0x66, 0x1f, 0x73, 0x8c, 0xca, 0x90, 0xe6, 0x17, - 0xac, 0x62, 0xd4, 0xd3, 0x3b, 0x45, 0x4b, 0x3c, 0xa2, 0x21, 0x54, 0x5c, 0x9f, 0x93, 0x70, 0x44, - 0x1c, 0x17, 0x73, 0x62, 0x33, 0x2e, 0x7e, 0x43, 0x4a, 0x39, 0xd3, 0x67, 0x7b, 0x67, 0x36, 0x95, - 0xed, 0x04, 0xa3, 0x2b, 0x08, 0x96, 0xc0, 0xeb, 0xcc, 0x6e, 0xba, 0x73, 0xb5, 0xe8, 0x53, 0xc8, - 0x45, 0xf6, 0xeb, 0xa2, 0xac, 0xcd, 0xae, 0x7c, 0xa0, 0x11, 0x87, 0x2e, 0xe3, 0x7a, 0xbd, 0x98, - 0x85, 0x3e, 0x86, 0xdc, 0x88, 0x30, 0x86, 0x07, 0x84, 0xc5, 0x27, 0x75, 0x66, 0x85, 0x23, 0x8d, - 0x88, 0xd8, 0x11, 0xc3, 0xfc, 0xb7, 0x01, 0xb9, 0x68, 0x79, 0x84, 0xe1, 0xb6, 0x33, 0x0e, 0x3c, - 0xb7, 0x2f, 0xbc, 0x3d, 0xa7, 0x9c, 0xd8, 0xb1, 0x6d, 0xaa, 0xfe, 0xde, 0x99, 0x5d, 0x79, 0x3f, - 0x22, 0x9c, 0x51, 0x4e, 0xa2, 0x95, 0x1e, 0x2d, 0x59, 0xb7, 0x9c, 0x79, 0x0a, 0xe4, 0xc3, 0x5d, - 0x4f, 0x14, 0x97, 0xdd, 0xf7, 0x5c, 0xe2, 0x73, 0x1b, 0x73, 0x8e, 0xfb, 0x4f, 0x26, 0xfb, 0xa8, - 0xe8, 0xbe, 0x3f, 0xbb, 0xcf, 0xa1, 0x60, 0xed, 0x49, 0x52, 0x53, 0x72, 0x12, 0x7b, 0x6d, 0x79, - 0x8b, 0x94, 0xad, 0x65, 0x48, 0xb3, 0xf1, 0xc8, 0x7c, 0x9e, 0x82, 0x5b, 0x73, 0x2d, 0x45, 0x1f, - 0xc2, 0x8a, 0xf4, 0x14, 0x6b, 0x17, 0x37, 0x67, 0xb7, 0x16, 0x78, 0x6b, 0x59, 0xa0, 0x9a, 0x31, - 0xbc, 0xa7, 0x2d, 0x7d, 0x25, 0xbc, 0x85, 0x3e, 0x00, 0x24, 0x3b, 0xb8, 0x88, 0xa6, 0xeb, 0x0f, - 0xec, 0x80, 0x3e, 0x25, 0xa1, 0x6e, 0x33, 0x65, 0xa9, 0x39, 0x93, 0x8a, 0x8e, 0x90, 0x4f, 0x95, - 0xaa, 0x86, 0x66, 0x24, 0x74, 0x52, 0xaa, 0x0a, 0xd8, 0x82, 0x7c, 0x3c, 0xaa, 0x74, 0x6f, 0x79, - 0xbd, 0xf6, 0x34, 0xa1, 0x99, 0x7f, 0x4d, 0xc1, 0xd6, 0xc2, 0xa0, 0xa2, 0x36, 0xac, 0xf7, 0xa9, - 0xff, 0xd8, 0x73, 0xfb, 0xd2, 0x6e, 0xd9, 0xc8, 0x74, 0x84, 0xee, 0x2e, 0x48, 0x8e, 0xec, 0x5b, - 0x56, 0x39, 0x41, 0x93, 0x12, 0x51, 0xb7, 0xa2, 0x85, 0x51, 0xdf, 0xd6, 0x5d, 0x36, 0x25, 0x7d, - 0x2a, 0x2a, 0xe1, 0x23, 0xd5, 0x6b, 0x8f, 0x61, 0xa3, 0x77, 0xf9, 0x0c, 0xfb, 0xdc, 0xf5, 0x49, - 0xa2, 0x03, 0x55, 0xd2, 0xf5, 0xf4, 0x4e, 0xe1, 0xc1, 0x9d, 0x39, 0x51, 0x8e, 0x30, 0xd6, 0xb7, - 0x62, 0xe2, 0xa4, 0x3d, 0x2d, 0x08, 0x7c, 0x66, 0x41, 0xe0, 0xdf, 0x46, 0x3c, 0x0f, 0xa1, 0x98, - 0xac, 0x53, 0x51, 0x97, 0x89, 0xea, 0x49, 0xcf, 0xaf, 0xcb, 0xf8, 0x9c, 0xde, 0xa8, 0x6a, 0xf3, - 0x13, 0xd8, 0x9c, 0xdf, 0x4f, 0xd0, 0x77, 0x61, 0x35, 0xc4, 0x4f, 0x55, 0x33, 0xb2, 0x3d, 0x97, - 0x71, 0xdd, 0xb8, 0x8a, 0x21, 0x7e, 0x2a, 0x11, 0x62, 0x77, 0xf3, 0x67, 0x90, 0x8b, 0x6a, 0x1e, - 0x7d, 0x02, 0xa5, 0xa8, 0xde, 0x27, 0x84, 0xb9, 0xd3, 0x48, 0x53, 0xac, 0x62, 0x84, 0x97, 0x6b, - 0x7d, 0x0a, 0x59, 0xad, 0x40, 0xdf, 0x86, 0xa2, 0x8f, 0x47, 0x84, 0x05, 0xb8, 0x4f, 0xc4, 0x5c, - 0x53, 0xf7, 0x80, 0x42, 0x2c, 0x6b, 0x3b, 0xe2, 0x8a, 0x20, 0x66, 0x4f, 0x74, 0x57, 0x11, 0xcf, - 0xe6, 0x2f, 0x60, 0x53, 0x74, 0xda, 0xe6, 0x39, 0x76, 0x3d, 0xdc, 0x73, 0x3d, 0x97, 0x5f, 0xea, - 0x11, 0x7f, 0x07, 0xf2, 0x21, 0xd5, 0xde, 0x68, 0x47, 0x72, 0x21, 0x55, 0x8e, 0x88, 0xdd, 0xfa, - 0xd4, 0x1b, 0x8f, 0xfc, 0xb8, 0xf5, 0x0a, 0x7d, 0x41, 0xc9, 0x24, 0xc4, 0xfc, 0x6f, 0x0a, 0x32, - 0xa2, 0xe0, 0xd0, 0x47, 0x90, 0x11, 0x3e, 0x48, 0x8b, 0x56, 0xe7, 0x5d, 0x3d, 0xba, 0xee, 0xc0, - 0x27, 0xce, 0x11, 0x1b, 0x9c, 0x5e, 0x06, 0xc4, 0x92, 0xe0, 0xc4, 0xe4, 0x4f, 0x4d, 0x4d, 0xfe, - 0x0d, 0x58, 0x0e, 0xe9, 0xd8, 0x77, 0x64, 0xa5, 0x2e, 0x5b, 0xea, 0x05, 0x1d, 0x40, 0x2e, 0x1e, - 0xe8, 0x99, 0xff, 0x37, 0xd0, 0xd7, 0x44, 0x42, 0xc5, 0x75, 0x43, 0x0b, 0xac, 0x6c, 0x4f, 0xcf, - 0xf5, 0xb7, 0x70, 0xd8, 0xd0, 0xfb, 0xb0, 0x3e, 0xe9, 0x14, 0xd1, 0x9c, 0x53, 0x97, 0x83, 0x72, - 0xac, 0xd0, 0x83, 0x6e, 0xba, 0xad, 0xa8, 0xbb, 0x62, 0x56, 0xfa, 0x35, 0x69, 0x2b, 0x6d, 0x79, - 0x69, 0xbc, 0x0b, 0x79, 0xe6, 0x0e, 0x7c, 0xcc, 0xc7, 0x21, 0xd1, 0x97, 0x84, 0x89, 0xc0, 0xfc, - 0xb3, 0x01, 0x2b, 0xea, 0xd2, 0x91, 0x88, 0x9b, 0x31, 0x3f, 0x6e, 0xa9, 0x45, 0x71, 0x4b, 0xbf, - 0x79, 0xdc, 0x9a, 0x00, 0xb1, 0x31, 0x62, 0xd4, 0x2d, 0x68, 0x0c, 0xca, 0xc4, 0xae, 0x3b, 0xd0, - 0x35, 0x95, 0x20, 0x99, 0xff, 0x30, 0x20, 0x1f, 0xeb, 0x51, 0x13, 0x4a, 0x91, 0x5d, 0xf6, 0x63, - 0x0f, 0x0f, 0xf4, 0xd9, 0xb9, 0xb7, 0xd0, 0xb8, 0xcf, 0x3c, 0x3c, 0xb0, 0x0a, 0xda, 0x1e, 0xf1, - 0x32, 0x3f, 0x0f, 0xa9, 0x05, 0x79, 0x98, 0x4a, 0x7c, 0xfa, 0xcd, 0x12, 0x3f, 0x95, 0xa2, 0xcc, - 0xcd, 0x14, 0xfd, 0x29, 0x05, 0xb9, 0x8e, 0xbc, 0xe6, 0x60, 0xef, 0x9b, 0xa8, 0x88, 0x3b, 0x90, - 0x0f, 0xa8, 0x67, 0x2b, 0x4d, 0x46, 0x6a, 0x72, 0x01, 0xf5, 0xac, 0x99, 0xb4, 0x2f, 0xbf, 0xa5, - 0x72, 0x59, 0x79, 0x0b, 0x51, 0xcb, 0xde, 0x8c, 0x5a, 0x08, 0x45, 0x15, 0x0a, 0xdd, 0x93, 0xee, - 0x8b, 0x18, 0xc8, 0xef, 0x18, 0x63, 0xf6, 0x33, 0x49, 0x99, 0xad, 0x90, 0x96, 0xc6, 0x09, 0x86, - 0xba, 0xa5, 0xeb, 0x5b, 0x41, 0x65, 0xd1, 0xb1, 0xb4, 0x34, 0xce, 0xfc, 0x9d, 0x01, 0x30, 0x99, - 0x9a, 0xe2, 0x83, 0x81, 0x49, 0x13, 0xec, 0xa9, 0x9d, 0x6b, 0x8b, 0x92, 0xa6, 0xf7, 0x2f, 0xb2, - 0xa4, 0xdd, 0x7b, 0x50, 0x9a, 0x1c, 0x46, 0x46, 0x22, 0x63, 0x6a, 0xaf, 0x18, 0x9e, 0x5d, 0xc2, - 0xad, 0xe2, 0x79, 0xe2, 0xcd, 0xfc, 0x8b, 0x01, 0x79, 0x69, 0xd3, 0x11, 0xe1, 0x78, 0x2a, 0x87, - 0xc6, 0x9b, 0xe7, 0xf0, 0x1e, 0x80, 0x5a, 0x86, 0xb9, 0xcf, 0x88, 0x3e, 0x59, 0x79, 0x29, 0xe9, - 0xba, 0xcf, 0x08, 0xfa, 0x51, 0x1c, 0xf0, 0xf4, 0xab, 0x03, 0xae, 0x4b, 0x3a, 0x0a, 0xfb, 0x6d, - 0xc8, 0xfa, 0xe3, 0x91, 0x2d, 0x2e, 0xef, 0x6a, 0xb2, 0xaf, 0xf8, 0xe3, 0xd1, 0xe9, 0x05, 0x33, - 0x7f, 0x0d, 0xd9, 0xd3, 0x0b, 0xf9, 0x25, 0xab, 0x06, 0x0c, 0xd5, 0x9f, 0x4f, 0x6a, 0x5c, 0xe5, - 0x84, 0x40, 0x7e, 0x2d, 0xcc, 0x99, 0x55, 0xa8, 0xf1, 0x9a, 0xdf, 0xc8, 0xfa, 0xeb, 0xf8, 0xbd, - 0xbf, 0x19, 0x50, 0x48, 0xf4, 0x07, 0xf4, 0x03, 0xb8, 0xd5, 0x3a, 0x3c, 0xd9, 0xfb, 0xdc, 0x6e, - 0xef, 0xdb, 0x9f, 0x1d, 0x36, 0x1f, 0xda, 0x5f, 0x1c, 0x7f, 0x7e, 0x7c, 0xf2, 0xf3, 0xe3, 0xf2, - 0x52, 0x75, 0xf3, 0xea, 0xba, 0x8e, 0x12, 0xd8, 0x2f, 0xfc, 0x27, 0x3e, 0x7d, 0xea, 0xa3, 0x5d, - 0xd8, 0x98, 0xa6, 0x34, 0x5b, 0xdd, 0x83, 0xe3, 0xd3, 0xb2, 0x51, 0xbd, 0x75, 0x75, 0x5d, 0x5f, - 0x4f, 0x30, 0x9a, 0x3d, 0x46, 0x7c, 0x3e, 0x4b, 0xd8, 0x3b, 0x39, 0x3a, 0x6a, 0x9f, 0x96, 0x53, - 0x33, 0x04, 0xdd, 0xb0, 0xdf, 0x85, 0xf5, 0x69, 0xc2, 0x71, 0xfb, 0xb0, 0x9c, 0xae, 0xa2, 0xab, - 0xeb, 0xfa, 0x6a, 0x02, 0x7d, 0xec, 0x7a, 0xd5, 0xdc, 0x6f, 0x7f, 0x5f, 0x5b, 0xfa, 0xe3, 0x1f, - 0x6a, 0x86, 0xf0, 0xac, 0x34, 0xd5, 0x23, 0xd0, 0x07, 0x70, 0xbb, 0xdb, 0x7e, 0x78, 0x7c, 0xb0, - 0x6f, 0x1f, 0x75, 0x1f, 0xda, 0xa7, 0xbf, 0xec, 0x1c, 0x24, 0xbc, 0x5b, 0xbb, 0xba, 0xae, 0x17, - 0xb4, 0x4b, 0x8b, 0xd0, 0x1d, 0xeb, 0xe0, 0xec, 0xe4, 0xf4, 0xa0, 0x6c, 0x28, 0x74, 0x27, 0x24, - 0xe2, 0x9e, 0x2c, 0xd1, 0xf7, 0x61, 0x6b, 0x0e, 0x3a, 0x76, 0x6c, 0xfd, 0xea, 0xba, 0x5e, 0xea, - 0x84, 0x44, 0xd5, 0x8f, 0x64, 0x34, 0xa0, 0x32, 0xcb, 0x38, 0xe9, 0x9c, 0x74, 0x9b, 0x87, 0xe5, - 0x7a, 0xb5, 0x7c, 0x75, 0x5d, 0x2f, 0x46, 0xcd, 0x50, 0xe0, 0x27, 0x9e, 0xb5, 0xce, 0xbe, 0x7c, - 0x51, 0x33, 0xbe, 0x7a, 0x51, 0x33, 0xfe, 0xf5, 0xa2, 0x66, 0x3c, 0x7f, 0x59, 0x5b, 0xfa, 0xea, - 0x65, 0x6d, 0xe9, 0xef, 0x2f, 0x6b, 0x4b, 0xbf, 0xfa, 0x78, 0xe0, 0xf2, 0xe1, 0xb8, 0xd7, 0xe8, - 0xd3, 0xd1, 0xae, 0x87, 0x9f, 0x5d, 0x7a, 0xc4, 0x19, 0x90, 0x30, 0xf1, 0xf8, 0x61, 0x9f, 0x86, - 0xfa, 0x1f, 0xa3, 0xdd, 0x9b, 0x7f, 0xef, 0xf4, 0x56, 0xa4, 0xfc, 0xa3, 0xff, 0x05, 0x00, 0x00, - 0xff, 0xff, 0xe9, 0x7b, 0x39, 0xf5, 0x9f, 0x12, 0x00, 0x00, + // 1807 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcb, 0x6f, 0x23, 0x49, + 0x19, 0x4f, 0xdb, 0x4e, 0x6c, 0x7f, 0xb6, 0x13, 0xa7, 0xc8, 0x64, 0x1c, 0xcf, 0x8c, 0x63, 0x9a, + 0xc7, 0x66, 0x5f, 0xce, 0x30, 0x8b, 0x10, 0x48, 0xcb, 0x6a, 0xed, 0x24, 0x3b, 0x63, 0x36, 0x0f, + 0xab, 0x9d, 0xcd, 0x02, 0x97, 0x56, 0xd9, 0x5d, 0x63, 0x37, 0xd3, 0xee, 0x6a, 0x75, 0x95, 0x33, + 0xc9, 0x1c, 0x39, 0xa1, 0x9c, 0xe6, 0xc4, 0x2d, 0x27, 0x38, 0xf0, 0x67, 0x20, 0x24, 0xa4, 0xbd, + 0x20, 0xed, 0x0d, 0x2e, 0x2c, 0x68, 0x06, 0x21, 0xfe, 0x0c, 0x54, 0x8f, 0x6e, 0xb7, 0x63, 0x7b, + 0x18, 0x8d, 0x46, 0x5c, 0xac, 0xae, 0xef, 0xfb, 0x7d, 0xf5, 0x3d, 0xaa, 0xbe, 0x47, 0x19, 0xee, + 0x72, 0xe2, 0x3b, 0x24, 0x1c, 0xb9, 0x3e, 0xdf, 0xe5, 0x97, 0x01, 0x61, 0xea, 0xb7, 0x11, 0x84, + 0x94, 0x53, 0x54, 0x9e, 0x70, 0x1b, 0x92, 0x5e, 0xdd, 0x18, 0xd0, 0x01, 0x95, 0xcc, 0x5d, 0xf1, + 0xa5, 0x70, 0xd5, 0xed, 0x01, 0xa5, 0x03, 0x8f, 0xec, 0xca, 0x55, 0x6f, 0xfc, 0x78, 0x97, 0xbb, + 0x23, 0xc2, 0x38, 0x1e, 0x05, 0x1a, 0x70, 0x2f, 0xa1, 0xa6, 0x1f, 0x5e, 0x06, 0x9c, 0x0a, 0x2c, + 0x7d, 0xac, 0xd9, 0xb5, 0x04, 0xfb, 0x9c, 0x84, 0xcc, 0xa5, 0x7e, 0xd2, 0x8e, 0x6a, 0x7d, 0xc6, + 0xca, 0x73, 0xec, 0xb9, 0x0e, 0xe6, 0x34, 0x54, 0x08, 0xf3, 0x27, 0x50, 0xea, 0xe0, 0x90, 0x77, + 0x09, 0x7f, 0x44, 0xb0, 0x43, 0x42, 0xb4, 0x01, 0xcb, 0x9c, 0x72, 0xec, 0x55, 0x8c, 0xba, 0xb1, + 0x53, 0xb2, 0xd4, 0x02, 0x21, 0xc8, 0x0c, 0x31, 0x1b, 0x56, 0x52, 0x75, 0x63, 0xa7, 0x68, 0xc9, + 0x6f, 0x73, 0x08, 0x19, 0x21, 0x2a, 0x24, 0x5c, 0xdf, 0x21, 0x17, 0x91, 0x84, 0x5c, 0x08, 0x6a, + 0xef, 0x92, 0x13, 0xa6, 0x45, 0xd4, 0x02, 0xfd, 0x10, 0x96, 0xa5, 0xfd, 0x95, 0x74, 0xdd, 0xd8, + 0x29, 0x3c, 0xa8, 0x34, 0x12, 0x81, 0x52, 0xfe, 0x35, 0x3a, 0x82, 0xdf, 0xca, 0x7c, 0xf5, 0xcd, + 0xf6, 0x92, 0xa5, 0xc0, 0xa6, 0x07, 0xd9, 0x96, 0x47, 0xfb, 0x4f, 0xda, 0xfb, 0xb1, 0x21, 0xc6, + 0xc4, 0x10, 0x74, 0x04, 0x6b, 0x01, 0x0e, 0xb9, 0xcd, 0x08, 0xb7, 0x87, 0xd2, 0x0b, 0xa9, 0xb4, + 0xf0, 0x60, 0xbb, 0x71, 0xf3, 0x1c, 0x1a, 0x53, 0xce, 0x6a, 0x2d, 0xa5, 0x20, 0x49, 0x34, 0xff, + 0x9d, 0x81, 0x15, 0x1d, 0x8c, 0x9f, 0x42, 0x56, 0x87, 0x55, 0x2a, 0x2c, 0x3c, 0xb8, 0x97, 0xdc, + 0x51, 0xb3, 0x1a, 0x7b, 0xd4, 0x67, 0xc4, 0x67, 0x63, 0xa6, 0xf7, 0x8b, 0x64, 0xd0, 0xf7, 0x21, + 0xd7, 0x1f, 0x62, 0xd7, 0xb7, 0x5d, 0x47, 0x5a, 0x94, 0x6f, 0x15, 0x5e, 0x7c, 0xb3, 0x9d, 0xdd, + 0x13, 0xb4, 0xf6, 0xbe, 0x95, 0x95, 0xcc, 0xb6, 0x83, 0x36, 0x61, 0x65, 0x48, 0xdc, 0xc1, 0x90, + 0xcb, 0xb0, 0xa4, 0x2d, 0xbd, 0x42, 0x3f, 0x86, 0x8c, 0xb8, 0x10, 0x95, 0x8c, 0xd4, 0x5d, 0x6d, + 0xa8, 0xdb, 0xd2, 0x88, 0x6e, 0x4b, 0xe3, 0x34, 0xba, 0x2d, 0xad, 0x9c, 0x50, 0xfc, 0xfc, 0x1f, + 0xdb, 0x86, 0x25, 0x25, 0xd0, 0x1e, 0x94, 0x3c, 0xcc, 0xb8, 0xdd, 0x13, 0x61, 0x13, 0xea, 0x97, + 0xe5, 0x16, 0x5b, 0xb3, 0x01, 0xd1, 0x81, 0xd5, 0xa6, 0x17, 0x84, 0x94, 0x22, 0x39, 0x68, 0x07, + 0xca, 0x72, 0x93, 0x3e, 0x1d, 0x8d, 0x5c, 0x6e, 0xcb, 0xb8, 0xaf, 0xc8, 0xb8, 0xaf, 0x0a, 0xfa, + 0x9e, 0x24, 0x3f, 0x12, 0x27, 0x70, 0x07, 0xf2, 0x0e, 0xe6, 0x58, 0x41, 0xb2, 0x12, 0x92, 0x13, + 0x04, 0xc9, 0x7c, 0x07, 0xd6, 0xe2, 0x5b, 0xc7, 0x14, 0x24, 0xa7, 0x76, 0x99, 0x90, 0x25, 0xf0, + 0x3e, 0x6c, 0xf8, 0xe4, 0x82, 0xdb, 0x37, 0xd1, 0x79, 0x89, 0x46, 0x82, 0x77, 0x36, 0x2d, 0xf1, + 0x3d, 0x58, 0xed, 0x47, 0xc1, 0x57, 0x58, 0x90, 0xd8, 0x52, 0x4c, 0x95, 0xb0, 0x2d, 0xc8, 0xe1, + 0x20, 0x50, 0x80, 0x82, 0x04, 0x64, 0x71, 0x10, 0x48, 0xd6, 0x7b, 0xb0, 0x2e, 0x7d, 0x0c, 0x09, + 0x1b, 0x7b, 0x5c, 0x6f, 0x52, 0x94, 0x98, 0x35, 0xc1, 0xb0, 0x14, 0x5d, 0x62, 0xbf, 0x03, 0x25, + 0x72, 0xee, 0x3a, 0xc4, 0xef, 0x13, 0x85, 0x2b, 0x49, 0x5c, 0x31, 0x22, 0x4a, 0xd0, 0xbb, 0x50, + 0x0e, 0x42, 0x1a, 0x50, 0x46, 0x42, 0x1b, 0x3b, 0x4e, 0x48, 0x18, 0xab, 0xac, 0xaa, 0xfd, 0x22, + 0x7a, 0x53, 0x91, 0xcd, 0x5f, 0xa7, 0x20, 0xb3, 0x8f, 0x39, 0x46, 0x65, 0x48, 0xf3, 0x0b, 0x56, + 0x31, 0xea, 0xe9, 0x9d, 0xa2, 0x25, 0x3e, 0xd1, 0x10, 0x2a, 0xae, 0xcf, 0x49, 0x38, 0x22, 0x8e, + 0x8b, 0x39, 0xb1, 0x19, 0x17, 0xbf, 0x21, 0xa5, 0x9c, 0xe9, 0xbb, 0xbd, 0x33, 0x7b, 0x94, 0xed, + 0x84, 0x44, 0x57, 0x08, 0x58, 0x02, 0xaf, 0x4f, 0x76, 0xd3, 0x9d, 0xcb, 0x45, 0x9f, 0x42, 0x2e, + 0xb2, 0x5f, 0x27, 0x65, 0x6d, 0x76, 0xe7, 0x03, 0x8d, 0x38, 0x74, 0x19, 0xd7, 0xfb, 0xc5, 0x52, + 0xe8, 0x63, 0xc8, 0x8d, 0x08, 0x63, 0x78, 0x40, 0x58, 0x7c, 0x53, 0x67, 0x76, 0x38, 0xd2, 0x88, + 0x48, 0x3a, 0x92, 0x30, 0xff, 0x65, 0x40, 0x2e, 0xda, 0x1e, 0x61, 0xb8, 0xed, 0x8c, 0x03, 0xcf, + 0xed, 0x0b, 0x6f, 0xcf, 0x29, 0x27, 0x76, 0x6c, 0x9b, 0xca, 0xbf, 0x77, 0x66, 0x77, 0xde, 0x8f, + 0x04, 0xce, 0x28, 0x27, 0xd1, 0x4e, 0x8f, 0x96, 0xac, 0x5b, 0xce, 0x3c, 0x06, 0xf2, 0xe1, 0xae, + 0x27, 0x92, 0xcb, 0xee, 0x7b, 0x2e, 0xf1, 0xb9, 0x8d, 0x39, 0xc7, 0xfd, 0x27, 0x13, 0x3d, 0x2a, + 0xba, 0xef, 0xcf, 0xea, 0x39, 0x14, 0x52, 0x7b, 0x52, 0xa8, 0x29, 0x65, 0x12, 0xba, 0xb6, 0xbc, + 0x45, 0xcc, 0xd6, 0x32, 0xa4, 0xd9, 0x78, 0x64, 0x3e, 0x4f, 0xc1, 0xad, 0xb9, 0x96, 0xa2, 0x0f, + 0x61, 0x45, 0x7a, 0x8a, 0xb5, 0x8b, 0x9b, 0xb3, 0xaa, 0x05, 0xde, 0x5a, 0x16, 0xa8, 0x66, 0x0c, + 0xef, 0x69, 0x4b, 0x5f, 0x09, 0x6f, 0xa1, 0x0f, 0x00, 0xc9, 0x0a, 0x2e, 0xa2, 0xe9, 0xfa, 0x03, + 0x3b, 0xa0, 0x4f, 0x49, 0xa8, 0xcb, 0x4c, 0x59, 0x72, 0xce, 0x24, 0xa3, 0x23, 0xe8, 0x53, 0xa9, + 0xaa, 0xa1, 0x19, 0x09, 0x9d, 0xa4, 0xaa, 0x02, 0xb6, 0x20, 0x1f, 0xb7, 0x2a, 0x5d, 0x5b, 0x5e, + 0xaf, 0x3c, 0x4d, 0xc4, 0xcc, 0xbf, 0xa4, 0x60, 0x6b, 0x61, 0x50, 0x51, 0x1b, 0xd6, 0xfb, 0xd4, + 0x7f, 0xec, 0xb9, 0x7d, 0x69, 0xb7, 0x2c, 0x64, 0x3a, 0x42, 0x77, 0x17, 0x1c, 0x8e, 0xac, 0x5b, + 0x56, 0x39, 0x21, 0x26, 0x29, 0x22, 0x6f, 0x45, 0x09, 0xa3, 0xbe, 0xad, 0xab, 0x6c, 0x4a, 0xfa, + 0x54, 0x54, 0xc4, 0x47, 0xaa, 0xd6, 0x1e, 0xc3, 0x46, 0xef, 0xf2, 0x19, 0xf6, 0xb9, 0xeb, 0x93, + 0x44, 0x05, 0xaa, 0xa4, 0xeb, 0xe9, 0x9d, 0xc2, 0x83, 0x3b, 0x73, 0xa2, 0x1c, 0x61, 0xac, 0x6f, + 0xc5, 0x82, 0x93, 0xf2, 0xb4, 0x20, 0xf0, 0x99, 0x05, 0x81, 0x7f, 0x1b, 0xf1, 0x3c, 0x84, 0x62, + 0x32, 0x4f, 0x45, 0x5e, 0x26, 0xb2, 0x27, 0x3d, 0x3f, 0x2f, 0xe3, 0x7b, 0x7a, 0x23, 0xab, 0xcd, + 0x4f, 0x60, 0x73, 0x7e, 0x3d, 0x41, 0xdf, 0x85, 0xd5, 0x10, 0x3f, 0x55, 0xc5, 0xc8, 0xf6, 0x5c, + 0xc6, 0x75, 0xe1, 0x2a, 0x86, 0xf8, 0xa9, 0x44, 0x08, 0xed, 0xe6, 0xcf, 0x20, 0x17, 0xe5, 0x3c, + 0xfa, 0x04, 0x4a, 0x51, 0xbe, 0x4f, 0x04, 0xe6, 0x76, 0x23, 0x2d, 0x62, 0x15, 0x23, 0xbc, 0xdc, + 0xeb, 0x53, 0xc8, 0x6a, 0x06, 0xfa, 0x36, 0x14, 0x7d, 0x3c, 0x22, 0x2c, 0xc0, 0x7d, 0x22, 0xfa, + 0x9a, 0x9a, 0x03, 0x0a, 0x31, 0xad, 0xed, 0x88, 0x11, 0x41, 0xf4, 0x9e, 0x68, 0x56, 0x11, 0xdf, + 0xe6, 0xcf, 0x61, 0x53, 0x54, 0xda, 0xe6, 0x39, 0x76, 0x3d, 0xdc, 0x73, 0x3d, 0x97, 0x5f, 0xea, + 0x16, 0x7f, 0x07, 0xf2, 0x21, 0xd5, 0xde, 0x68, 0x47, 0x72, 0x21, 0x55, 0x8e, 0x08, 0x6d, 0x7d, + 0xea, 0x8d, 0x47, 0x7e, 0x5c, 0x7a, 0x05, 0xbf, 0xa0, 0x68, 0x12, 0x62, 0xfe, 0x27, 0x05, 0x19, + 0x91, 0x70, 0xe8, 0x23, 0xc8, 0x08, 0x1f, 0xa4, 0x45, 0xab, 0xf3, 0x46, 0x8f, 0xae, 0x3b, 0xf0, + 0x89, 0x73, 0xc4, 0x06, 0xa7, 0x97, 0x01, 0xb1, 0x24, 0x38, 0xd1, 0xf9, 0x53, 0x53, 0x9d, 0x7f, + 0x03, 0x96, 0x43, 0x3a, 0xf6, 0x1d, 0x99, 0xa9, 0xcb, 0x96, 0x5a, 0xa0, 0x03, 0xc8, 0xc5, 0x0d, + 0x3d, 0xf3, 0xbf, 0x1a, 0xfa, 0x9a, 0x38, 0x50, 0x31, 0x6e, 0x68, 0x82, 0x95, 0xed, 0xe9, 0xbe, + 0xfe, 0x16, 0x2e, 0x1b, 0x7a, 0x1f, 0xd6, 0x27, 0x95, 0x22, 0xea, 0x73, 0x6a, 0x38, 0x28, 0xc7, + 0x0c, 0xdd, 0xe8, 0xa6, 0xcb, 0x8a, 0x9a, 0x15, 0xb3, 0xd2, 0xaf, 0x49, 0x59, 0x69, 0xcb, 0xa1, + 0xf1, 0x2e, 0xe4, 0x99, 0x3b, 0xf0, 0x31, 0x1f, 0x87, 0x44, 0x0f, 0x09, 0x13, 0x82, 0xf9, 0x47, + 0x03, 0x56, 0xd4, 0xd0, 0x91, 0x88, 0x9b, 0x31, 0x3f, 0x6e, 0xa9, 0x45, 0x71, 0x4b, 0xbf, 0x79, + 0xdc, 0x9a, 0x00, 0xb1, 0x31, 0xa2, 0xd5, 0x2d, 0x28, 0x0c, 0xca, 0xc4, 0xae, 0x3b, 0xd0, 0x39, + 0x95, 0x10, 0x32, 0xff, 0x6e, 0x40, 0x3e, 0xe6, 0xa3, 0x26, 0x94, 0x22, 0xbb, 0xec, 0xc7, 0x1e, + 0x1e, 0xe8, 0xbb, 0x73, 0x6f, 0xa1, 0x71, 0x9f, 0x79, 0x78, 0x60, 0x15, 0xb4, 0x3d, 0x62, 0x31, + 0xff, 0x1c, 0x52, 0x0b, 0xce, 0x61, 0xea, 0xe0, 0xd3, 0x6f, 0x76, 0xf0, 0x53, 0x47, 0x94, 0xb9, + 0x79, 0x44, 0x7f, 0x4e, 0x41, 0xae, 0x23, 0xc7, 0x1c, 0xec, 0xfd, 0x3f, 0x32, 0xe2, 0x0e, 0xe4, + 0x03, 0xea, 0xd9, 0x8a, 0x93, 0x91, 0x9c, 0x5c, 0x40, 0x3d, 0x4b, 0x32, 0xbf, 0x14, 0x53, 0x69, + 0xf4, 0x22, 0x58, 0x5e, 0x34, 0x35, 0xcd, 0xaf, 0x0b, 0xad, 0xb2, 0xbe, 0x06, 0xb9, 0xfd, 0xa6, + 0xa2, 0x88, 0x89, 0x56, 0xd7, 0x8c, 0xa9, 0x38, 0xae, 0xbc, 0x85, 0x38, 0x66, 0x6f, 0xc6, 0x31, + 0x84, 0xa2, 0x0a, 0x8e, 0xd6, 0x78, 0x5f, 0x44, 0x45, 0xfa, 0x61, 0xcc, 0x3e, 0x9c, 0x94, 0x1f, + 0xda, 0x4a, 0x8d, 0x13, 0x12, 0x6a, 0x6e, 0xd7, 0x73, 0x42, 0x65, 0xd1, 0x45, 0xb5, 0x34, 0xce, + 0xfc, 0xad, 0x01, 0x30, 0xe9, 0xa3, 0xe2, 0x09, 0xc1, 0xa4, 0x09, 0xf6, 0x94, 0xe6, 0xda, 0xa2, + 0x63, 0xd4, 0xfa, 0x8b, 0x2c, 0x69, 0xf7, 0x1e, 0x94, 0x26, 0xd7, 0x93, 0x91, 0xc8, 0x98, 0xda, + 0x2b, 0xda, 0x69, 0x97, 0x70, 0xab, 0x78, 0x9e, 0x58, 0x99, 0x7f, 0x32, 0x20, 0x2f, 0x6d, 0x3a, + 0x22, 0x1c, 0x4f, 0x25, 0xb3, 0xf1, 0xe6, 0xc9, 0x7c, 0x0f, 0x40, 0x6d, 0xc3, 0xdc, 0x67, 0x44, + 0xdf, 0xb5, 0xbc, 0xa4, 0x74, 0xdd, 0x67, 0x04, 0xfd, 0x28, 0x0e, 0x78, 0xfa, 0xd5, 0x01, 0xd7, + 0x49, 0x1e, 0x85, 0xfd, 0x36, 0x64, 0xfd, 0xf1, 0xc8, 0x16, 0xe3, 0xbc, 0xea, 0xf5, 0x2b, 0xfe, + 0x78, 0x74, 0x7a, 0xc1, 0xcc, 0x5f, 0x41, 0xf6, 0xf4, 0x42, 0xbe, 0x6d, 0x55, 0xcb, 0xa1, 0xfa, + 0x41, 0xa5, 0x1a, 0x58, 0x4e, 0x10, 0xe4, 0xfb, 0x61, 0x4e, 0xf7, 0x42, 0x8d, 0xd7, 0x7c, 0x35, + 0xeb, 0xf7, 0xf2, 0x7b, 0x7f, 0x35, 0xa0, 0x90, 0xa8, 0x18, 0xe8, 0x07, 0x70, 0xab, 0x75, 0x78, + 0xb2, 0xf7, 0xb9, 0xdd, 0xde, 0xb7, 0x3f, 0x3b, 0x6c, 0x3e, 0xb4, 0xbf, 0x38, 0xfe, 0xfc, 0xf8, + 0xe4, 0xcb, 0xe3, 0xf2, 0x52, 0x75, 0xf3, 0xea, 0xba, 0x8e, 0x12, 0xd8, 0x2f, 0xfc, 0x27, 0x3e, + 0x7d, 0xea, 0xa3, 0x5d, 0xd8, 0x98, 0x16, 0x69, 0xb6, 0xba, 0x07, 0xc7, 0xa7, 0x65, 0xa3, 0x7a, + 0xeb, 0xea, 0xba, 0xbe, 0x9e, 0x90, 0x68, 0xf6, 0x18, 0xf1, 0xf9, 0xac, 0xc0, 0xde, 0xc9, 0xd1, + 0x51, 0xfb, 0xb4, 0x9c, 0x9a, 0x11, 0xd0, 0x25, 0xfc, 0x5d, 0x58, 0x9f, 0x16, 0x38, 0x6e, 0x1f, + 0x96, 0xd3, 0x55, 0x74, 0x75, 0x5d, 0x5f, 0x4d, 0xa0, 0x8f, 0x5d, 0xaf, 0x9a, 0xfb, 0xcd, 0xef, + 0x6a, 0x4b, 0x7f, 0xf8, 0x7d, 0xcd, 0x10, 0x9e, 0x95, 0xa6, 0xaa, 0x06, 0xfa, 0x00, 0x6e, 0x77, + 0xdb, 0x0f, 0x8f, 0x0f, 0xf6, 0xed, 0xa3, 0xee, 0x43, 0xfb, 0xf4, 0x17, 0x9d, 0x83, 0x84, 0x77, + 0x6b, 0x57, 0xd7, 0xf5, 0x82, 0x76, 0x69, 0x11, 0xba, 0x63, 0x1d, 0x9c, 0x9d, 0x9c, 0x1e, 0x94, + 0x0d, 0x85, 0xee, 0x84, 0x44, 0x4c, 0xce, 0x12, 0x7d, 0x1f, 0xb6, 0xe6, 0xa0, 0x63, 0xc7, 0xd6, + 0xaf, 0xae, 0xeb, 0xa5, 0x4e, 0x48, 0x54, 0xfe, 0x48, 0x89, 0x06, 0x54, 0x66, 0x25, 0x4e, 0x3a, + 0x27, 0xdd, 0xe6, 0x61, 0xb9, 0x5e, 0x2d, 0x5f, 0x5d, 0xd7, 0x8b, 0x51, 0x79, 0x14, 0xf8, 0x89, + 0x67, 0xad, 0xb3, 0xaf, 0x5e, 0xd4, 0x8c, 0xaf, 0x5f, 0xd4, 0x8c, 0x7f, 0xbe, 0xa8, 0x19, 0xcf, + 0x5f, 0xd6, 0x96, 0xbe, 0x7e, 0x59, 0x5b, 0xfa, 0xdb, 0xcb, 0xda, 0xd2, 0x2f, 0x3f, 0x1e, 0xb8, + 0x7c, 0x38, 0xee, 0x35, 0xfa, 0x74, 0xb4, 0xeb, 0xe1, 0x67, 0x97, 0x1e, 0x71, 0x06, 0x24, 0x4c, + 0x7c, 0x7e, 0xd8, 0xa7, 0xa1, 0xfe, 0x0f, 0x69, 0xf7, 0xe6, 0x1f, 0x3e, 0xbd, 0x15, 0x49, 0xff, + 0xe8, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd1, 0xa8, 0x35, 0xdb, 0xb1, 0x12, 0x00, 0x00, } func (m *PartSetHeader) Marshal() (dAtA []byte, err error) { @@ -2599,7 +2600,7 @@ func (m *Proposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x32 { - size, err := m.BlockID.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.DAHeader.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -3233,7 +3234,7 @@ func (m *Proposal) Size() (n int) { if m.PolRound != 0 { n += 1 + sovTypes(uint64(m.PolRound)) } - l = m.BlockID.Size() + l = m.DAHeader.Size() n += 1 + l + sovTypes(uint64(l)) l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp) n += 1 + l + sovTypes(uint64(l)) @@ -6045,7 +6046,7 @@ func (m *Proposal) Unmarshal(dAtA []byte) error { } case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field BlockID", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field DAHeader", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -6072,7 +6073,7 @@ func (m *Proposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.BlockID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.DAHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/proto/tendermint/types/types.proto b/proto/tendermint/types/types.proto index 971af04c40..4f699adfc7 100644 --- a/proto/tendermint/types/types.proto +++ b/proto/tendermint/types/types.proto @@ -188,7 +188,7 @@ message Proposal { int64 height = 2; int32 round = 3; int32 pol_round = 4; - BlockID block_id = 5 [(gogoproto.customname) = "BlockID", (gogoproto.nullable) = false]; + DataAvailabilityHeader da_header = 5 [(gogoproto.customname) = "DAHeader", (gogoproto.nullable) = false]; google.protobuf.Timestamp timestamp = 6 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; bytes signature = 7; diff --git a/types/block.go b/types/block.go index c45a1b86b5..6bcfe4de78 100644 --- a/types/block.go +++ b/types/block.go @@ -2,6 +2,7 @@ package types import ( "bytes" + "crypto/sha256" "errors" "fmt" "math" @@ -10,6 +11,8 @@ import ( "github.com/gogo/protobuf/proto" gogotypes "github.com/gogo/protobuf/types" + "github.com/ipfs/go-cid" + mh "github.com/multiformats/go-multihash" "github.com/lazyledger/nmt" "github.com/lazyledger/nmt/namespace" @@ -64,20 +67,68 @@ type DataAvailabilityHeader struct { type NmtRoots []namespace.IntervalDigest +func NmtRootsFromBytes(in [][]byte) (roots NmtRoots, err error) { + roots = make([]namespace.IntervalDigest, len(in)) + for i := 0; i < len(in); i++ { + roots[i], err = namespace.IntervalDigestFromBytes(NamespaceSize, in[i]) + if err != nil { + return + } + } + + return +} + +// TODO(Hlib): Import from #178 once merged +const ( + namespaceSize = 8 + Nmt = 0x7700 + nmtHashSize = 2*namespaceSize + sha256.Size + Sha256Namespace8Flagged = 0x7701 +) + +func init() { + mh.Codes[Sha256Namespace8Flagged] = "sha2-256-namespace8-flagged" + mh.DefaultLengths[Sha256Namespace8Flagged] = nmtHashSize +} + +func cidFromNamespacedSha256(namespacedHash []byte) (cid.Cid, error) { + if got, want := len(namespacedHash), nmtHashSize; got != want { + return cid.Cid{}, fmt.Errorf("invalid namespaced hash length, got: %v, want: %v", got, want) + } + + buf, err := mh.Encode(namespacedHash, Sha256Namespace8Flagged) + if err != nil { + return cid.Undef, err + } + + return cid.NewCidV1(Nmt, buf), nil +} + +func (roots NmtRoots) String() string { + sb := new(strings.Builder) + sb.WriteRune('{') + + for _, r := range roots { + id, err := cidFromNamespacedSha256(r.Bytes()) + if err != nil { + panic(err) + } + + sb.WriteString(id.String() + ",") // nolint: errcheck + } + + sb.WriteRune('}') + return sb.String() +} + func (roots NmtRoots) Bytes() [][]byte { res := make([][]byte, len(roots)) for i := 0; i < len(roots); i++ { res[i] = roots[i].Bytes() } - return res -} -func NmtRootsFromBytes(in [][]byte) NmtRoots { - roots := make([]namespace.IntervalDigest, len(in)) - for i := 0; i < len(in); i++ { - roots[i] = namespace.IntervalDigestFromBytes(NamespaceSize, in[i]) - } - return roots + return res } // Hash computes the root of the row and column roots @@ -99,29 +150,35 @@ func (dah *DataAvailabilityHeader) Hash() []byte { return merkle.HashFromByteSlices(slices) } -func (dah *DataAvailabilityHeader) ToProto() (*tmproto.DataAvailabilityHeader, error) { +func (dah *DataAvailabilityHeader) ToProto() *tmproto.DataAvailabilityHeader { if dah == nil { - return nil, errors.New("nil DataAvailabilityHeader") + return &tmproto.DataAvailabilityHeader{} } dahp := new(tmproto.DataAvailabilityHeader) - dahp.RowRoots = dah.RowsRoots.Bytes() dahp.ColumnRoots = dah.ColumnRoots.Bytes() - return dahp, nil + return dahp } -func DataAvailabilityHeaderFromProto(dahp *tmproto.DataAvailabilityHeader) (*DataAvailabilityHeader, error) { +func DataAvailabilityHeaderFromProto(dahp *tmproto.DataAvailabilityHeader) (dah *DataAvailabilityHeader, err error) { if dahp == nil { return nil, errors.New("nil DataAvailabilityHeader") } - dah := new(DataAvailabilityHeader) - dah.RowsRoots = NmtRootsFromBytes(dahp.RowRoots) - dah.ColumnRoots = NmtRootsFromBytes(dahp.ColumnRoots) + dah = new(DataAvailabilityHeader) + dah.RowsRoots, err = NmtRootsFromBytes(dahp.RowRoots) + if err != nil { + return + } - return dah, nil + dah.ColumnRoots, err = NmtRootsFromBytes(dahp.ColumnRoots) + if err != nil { + return + } + + return } // Block defines the atomic unit of a Tendermint blockchain. @@ -374,11 +431,7 @@ func (b *Block) ToProto() (*tmproto.Block, error) { return nil, err } pb.Data.Evidence = *protoEvidence - dah, err := b.DataAvailabilityHeader.ToProto() - if err != nil { - return nil, err - } - pb.DataAvailabilityHeader = dah + pb.DataAvailabilityHeader = b.DataAvailabilityHeader.ToProto() return pb, nil } diff --git a/types/block_test.go b/types/block_test.go index 9f42cf4a62..4aa5175893 100644 --- a/types/block_test.go +++ b/types/block_test.go @@ -183,6 +183,15 @@ func TestBlockString(t *testing.T) { assert.NotEqual(t, "nil-Block", block.StringShort()) } +func makeDAHeaderRandom() DataAvailabilityHeader { + rows, _ := NmtRootsFromBytes([][]byte{tmrand.Bytes(2*NamespaceSize+tmhash.Size)}) + clns, _ := NmtRootsFromBytes([][]byte{tmrand.Bytes(2*NamespaceSize+tmhash.Size)}) + return DataAvailabilityHeader{ + RowsRoots: rows, + ColumnRoots: clns, + } +} + func makeBlockIDRandom() BlockID { var ( blockHash = make([]byte, tmhash.Size) diff --git a/types/canonical.go b/types/canonical.go index 0f520013f6..8b7fbb8253 100644 --- a/types/canonical.go +++ b/types/canonical.go @@ -45,7 +45,7 @@ func CanonicalizeProposal(chainID string, proposal *tmproto.Proposal) tmproto.Ca Height: proposal.Height, // encoded as sfixed64 Round: int64(proposal.Round), // encoded as sfixed64 POLRound: int64(proposal.PolRound), - BlockID: CanonicalizeBlockID(proposal.BlockID), + DAHeader: proposal.DAHeader, Timestamp: proposal.Timestamp, ChainID: chainID, } diff --git a/types/proposal.go b/types/proposal.go index a37782bb61..667cfeb920 100644 --- a/types/proposal.go +++ b/types/proposal.go @@ -24,22 +24,22 @@ var ( // If POLRound >= 0, then BlockID corresponds to the block that is locked in POLRound. type Proposal struct { Type tmproto.SignedMsgType - Height int64 `json:"height"` - Round int32 `json:"round"` // there can not be greater than 2_147_483_647 rounds - POLRound int32 `json:"pol_round"` // -1 if null. - BlockID BlockID `json:"block_id"` - Timestamp time.Time `json:"timestamp"` - Signature []byte `json:"signature"` + Height int64 `json:"height"` + Round int32 `json:"round"` // there can not be greater than 2_147_483_647 rounds + POLRound int32 `json:"pol_round"` // -1 if null. + DAHeader DataAvailabilityHeader `json:"block_id"` + Timestamp time.Time `json:"timestamp"` + Signature []byte `json:"signature"` } // NewProposal returns a new Proposal. // If there is no POLRound, polRound should be -1. -func NewProposal(height int64, round int32, polRound int32, blockID BlockID) *Proposal { +func NewProposal(height int64, round int32, polRound int32, daH DataAvailabilityHeader) *Proposal { return &Proposal{ Type: tmproto.ProposalType, Height: height, Round: round, - BlockID: blockID, + DAHeader: daH, POLRound: polRound, Timestamp: tmtime.Now(), } @@ -59,15 +59,10 @@ func (p *Proposal) ValidateBasic() error { if p.POLRound < -1 { return errors.New("negative POLRound (exception: -1)") } - if err := p.BlockID.ValidateBasic(); err != nil { - return fmt.Errorf("wrong BlockID: %v", err) - } - // ValidateBasic above would pass even if the BlockID was empty: - if !p.BlockID.IsComplete() { - return fmt.Errorf("expected a complete, non-empty BlockID, got: %v", p.BlockID) - } - // NOTE: Timestamp validation is subtle and handled elsewhere. + // NOTE: + // * Timestamp validation is subtle and handled elsewhere. + // * DAHeader is validated within deserialization if len(p.Signature) == 0 { return errors.New("signature is missing") @@ -90,10 +85,10 @@ func (p *Proposal) ValidateBasic() error { // // See BlockID#String. func (p *Proposal) String() string { - return fmt.Sprintf("Proposal{%v/%v (%v, %v) %X @ %s}", + return fmt.Sprintf("Proposal{%v/%v, %v, %v %X @ %s}", p.Height, p.Round, - p.BlockID, + p.DAHeader, p.POLRound, tmbytes.Fingerprint(p.Signature), CanonicalTime(p.Timestamp)) @@ -124,7 +119,7 @@ func (p *Proposal) ToProto() *tmproto.Proposal { } pb := new(tmproto.Proposal) - pb.BlockID = p.BlockID.ToProto() + pb.DAHeader = *p.DAHeader.ToProto() pb.Type = p.Type pb.Height = p.Height pb.Round = p.Round @@ -144,12 +139,12 @@ func ProposalFromProto(pp *tmproto.Proposal) (*Proposal, error) { p := new(Proposal) - blockID, err := BlockIDFromProto(&pp.BlockID) + dah, err := DataAvailabilityHeaderFromProto(&pp.DAHeader) if err != nil { return nil, err } - p.BlockID = *blockID + p.DAHeader = *dah p.Type = pp.Type p.Height = pp.Height p.Round = pp.Round diff --git a/types/proposal_test.go b/types/proposal_test.go index 742ac7caef..76e5f1b294 100644 --- a/types/proposal_test.go +++ b/types/proposal_test.go @@ -1,7 +1,6 @@ package types import ( - "math" "testing" "time" @@ -9,9 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/lazyledger/lazyledger-core/crypto/tmhash" "github.com/lazyledger/lazyledger-core/libs/protoio" - tmrand "github.com/lazyledger/lazyledger-core/libs/rand" tmproto "github.com/lazyledger/lazyledger-core/proto/tendermint/types" ) @@ -21,15 +18,20 @@ var ( ) func init() { - var stamp, err = time.Parse(TimeFormat, "2018-02-11T07:09:22.765Z") + rows, _ := NmtRootsFromBytes([][]byte{[]byte("HeHasBeenElected--June_15_2020_amino_was_removed")}) + clmns, _ := NmtRootsFromBytes([][]byte{[]byte("HeHasBeenElected--June_15_2020_amino_was_removed")}) + + stamp, err := time.Parse(TimeFormat, "2018-02-11T07:09:22.765Z") if err != nil { panic(err) } testProposal = &Proposal{ Height: 12345, Round: 23456, - BlockID: BlockID{Hash: []byte("--June_15_2020_amino_was_removed"), - PartSetHeader: PartSetHeader{Total: 111, Hash: []byte("--June_15_2020_amino_was_removed")}}, + DAHeader: DataAvailabilityHeader{ + RowsRoots: rows, + ColumnRoots: clmns, + }, POLRound: -1, Timestamp: stamp, } @@ -48,7 +50,7 @@ func TestProposalSignable(t *testing.T) { func TestProposalString(t *testing.T) { str := testProposal.String() - expected := `Proposal{12345/23456 (2D2D4A756E655F31355F323032305F616D696E6F5F7761735F72656D6F766564:111:2D2D4A756E65, -1) 000000000000 @ 2018-02-11T07:09:22.765Z}` //nolint:lll // ignore line length for tests + expected := `Proposal{12345/23456, {{bagao4amb5yatasdfjbqxgqtfmvxek3dfmn2gkzbnfvfhk3tfl4ytkxzsgazdax3bnvuw4327o5qxgx3smvww65tfmq,} {bagao4amb5yatasdfjbqxgqtfmvxek3dfmn2gkzbnfvfhk3tfl4ytkxzsgazdax3bnvuw4327o5qxgx3smvww65tfmq,}}, -1 000000000000 @ 2018-02-11T07:09:22.765Z}` //nolint:lll // ignore line length for tests if str != expected { t.Errorf("got unexpected string for Proposal. Expected:\n%v\nGot:\n%v", expected, str) } @@ -59,9 +61,7 @@ func TestProposalVerifySignature(t *testing.T) { pubKey, err := privVal.GetPubKey() require.NoError(t, err) - prop := NewProposal( - 4, 2, 2, - BlockID{tmrand.Bytes(tmhash.Size), PartSetHeader{777, tmrand.Bytes(tmhash.Size)}}) + prop := NewProposal(4, 2, 2, makeDAHeaderRandom()) p := prop.ToProto() signBytes := ProposalSignBytes("test_chain_id", p) @@ -123,7 +123,6 @@ func BenchmarkProposalVerifySignature(b *testing.B) { } func TestProposalValidateBasic(t *testing.T) { - privVal := NewMockPV() testCases := []struct { testName string @@ -135,9 +134,6 @@ func TestProposalValidateBasic(t *testing.T) { {"Invalid Height", func(p *Proposal) { p.Height = -1 }, true}, {"Invalid Round", func(p *Proposal) { p.Round = -1 }, true}, {"Invalid POLRound", func(p *Proposal) { p.POLRound = -2 }, true}, - {"Invalid BlockId", func(p *Proposal) { - p.BlockID = BlockID{[]byte{1, 2, 3}, PartSetHeader{111, []byte("blockparts")}} - }, true}, {"Invalid Signature", func(p *Proposal) { p.Signature = make([]byte, 0) }, true}, @@ -145,14 +141,12 @@ func TestProposalValidateBasic(t *testing.T) { p.Signature = make([]byte, MaxSignatureSize+1) }, true}, } - blockID := makeBlockID(tmhash.Sum([]byte("blockhash")), math.MaxInt32, tmhash.Sum([]byte("partshash"))) + dah := makeDAHeaderRandom() for _, tc := range testCases { tc := tc t.Run(tc.testName, func(t *testing.T) { - prop := NewProposal( - 4, 2, 2, - blockID) + prop := NewProposal(4, 2, 2, dah) p := prop.ToProto() err := privVal.SignProposal("test_chain_id", p) prop.Signature = p.Signature @@ -164,9 +158,9 @@ func TestProposalValidateBasic(t *testing.T) { } func TestProposalProtoBuf(t *testing.T) { - proposal := NewProposal(1, 2, 3, makeBlockID([]byte("hash"), 2, []byte("part_set_hash"))) + proposal := NewProposal(1, 2, 3, makeDAHeaderRandom()) proposal.Signature = []byte("sig") - proposal2 := NewProposal(1, 2, 3, BlockID{}) + proposal2 := NewProposal(1, 2, 3, DataAvailabilityHeader{}) testCases := []struct { msg string