diff --git a/go.mod b/go.mod index 9957f80..2a02d12 100644 --- a/go.mod +++ b/go.mod @@ -25,6 +25,7 @@ require ( require ( github.com/evmos/evmos/v6 v6.0.1 github.com/golang/glog v1.0.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.0 // indirect golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e // indirect golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c // indirect google.golang.org/protobuf v1.28.0 diff --git a/go.sum b/go.sum index f3c8919..a84f555 100644 --- a/go.sum +++ b/go.sum @@ -36,6 +36,7 @@ cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Ud cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM= cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= +cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -48,11 +49,13 @@ cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJW cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= +cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/firestore v1.6.0/go.mod h1:afJwI0vaXwAG54kI7A//lP/lSPDkQORQuMkv56TxEPU= cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= +cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -65,6 +68,7 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= +cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= contrib.go.opencensus.io/exporter/stackdriver v0.13.4/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= @@ -460,6 +464,7 @@ github.com/fzipp/gocyclo v0.3.1/go.mod h1:DJHO6AUmbdqj2ET4Z9iArSuwWgYDRryYt2wASx github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= +github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= @@ -663,6 +668,7 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= 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/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= @@ -670,6 +676,7 @@ github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0 github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= +github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gookit/color v1.4.2/go.mod h1:fqRyamkC1W8uxl+lxCQxOT09l/vYfZ+QeiX3rKQHCoQ= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -717,6 +724,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod h1:8XEsbTttt/W+VvjtQhLACqC github.com/grpc-ecosystem/grpc-gateway v1.14.7/go.mod h1:oYZKL012gGh6LMyg/xA7Q2yq6j8bu0wa+9w14EEthWU= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.0 h1:Ghn7copILfeIg0y8sTGRppI1bd8I4l2VN3cob0Xeqwg= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.0/go.mod h1:dnjr4snxnhRSn5GWqJUva2AoMbeaxyAcepvc0Tg8lXk= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/gtank/merlin v0.1.1-0.20191105220539-8318aed1a79f/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= @@ -1673,6 +1682,7 @@ golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220614195744-fb05da6f9022/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e h1:TsQ7F31D3bUCLeqPT0u+yjp1guoArKaNKmCr22PYgTQ= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= @@ -1697,6 +1707,8 @@ golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= +golang.org/x/oauth2 v0.0.0-20220718184931-c8730f7fcb92/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= 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= @@ -1710,6 +1722,7 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220513210516-0976fa681c29/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1831,7 +1844,9 @@ golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/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-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220614162138-6c1b26c55098/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c h1:aFV+BgZ4svzjfabn8ERpuB4JI4N6/rdy1iusx77G3oU= golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1968,6 +1983,7 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.6.0/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU= @@ -2017,7 +2033,9 @@ google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= +google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= google.golang.org/api v0.81.0/go.mod h1:FA6Mb/bZxj706H2j+j2d6mHEEaHBmbbWnkfvmorOCko= +google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2081,6 +2099,7 @@ google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= @@ -2121,7 +2140,11 @@ google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220627200112-0a929928cb33/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220719170305-83ca9fad585f h1:P8EiVSxZwC6xH2niv2N66aqwMtYFg+D54gbjpcqKJtM= diff --git a/network/init.sh b/network/init.sh index b19dd8b..186bbfd 100755 --- a/network/init.sh +++ b/network/init.sh @@ -33,12 +33,12 @@ echo "Adding accounts..." echo $VAL_MNEMONIC_1 | $BINARY keys add val --home $CHAIN_DIR/$CHAINID_1 --recover --keyring-backend=test echo $DEMO_MNEMONIC_1 | $BINARY keys add demowallet1 --home $CHAIN_DIR/$CHAINID_1 --recover --keyring-backend=test echo $DEMO_MNEMONIC_2 | osmosisd keys add demowallet2 --home $CHAIN_DIR/$CHAINID_2 --recover --keyring-backend=test -echo $RLY_MNEMONIC_1 | $BINARY keys add rly1 --home $CHAIN_DIR/$CHAINID_1 --recover --keyring-backend=test -echo $RLY_MNEMONIC_2 | osmosisd keys add rly2 --home $CHAIN_DIR/$CHAINID_2 --recover --keyring-backend=test +echo $RLY_MNEMONIC_1 | $BINARY keys add rly --home $CHAIN_DIR/$CHAINID_1 --recover --keyring-backend=test +echo $RLY_MNEMONIC_2 | osmosisd keys add rly --home $CHAIN_DIR/$CHAINID_2 --recover --keyring-backend=test $BINARY add-genesis-account $($BINARY --home $CHAIN_DIR/$CHAINID_1 keys show val --keyring-backend test -a) 100000000000ufetf --home $CHAIN_DIR/$CHAINID_1 $BINARY add-genesis-account $($BINARY --home $CHAIN_DIR/$CHAINID_1 keys show demowallet1 --keyring-backend test -a) 100000000000ufetf --home $CHAIN_DIR/$CHAINID_1 -$BINARY add-genesis-account $($BINARY --home $CHAIN_DIR/$CHAINID_1 keys show rly1 --keyring-backend test -a) 100000000000ufetf --home $CHAIN_DIR/$CHAINID_1 +$BINARY add-genesis-account $($BINARY --home $CHAIN_DIR/$CHAINID_1 keys show rly --keyring-backend test -a) 100000000000ufetf --home $CHAIN_DIR/$CHAINID_1 echo "Creating and collecting gentx..." $BINARY gentx val 7000000000ufetf --home $CHAIN_DIR/$CHAINID_1 --chain-id $CHAINID_1 --keyring-backend test diff --git a/network/relayer/config.yaml b/network/relayer/config.yaml index caf8a07..c596326 100644 --- a/network/relayer/config.yaml +++ b/network/relayer/config.yaml @@ -5,7 +5,7 @@ global: chains: - type: cosmos value: - key: rly1 + key: rly chain-id: defund rpc-addr: http://localhost:26657 account-prefix: defund @@ -18,7 +18,7 @@ chains: sign-mode: direct - type: cosmos value: - key: rly2 + key: rly chain-id: osmo-test-4 rpc-addr: http://143.198.139.33:26657 account-prefix: osmo diff --git a/network/relayer/config/config.yaml b/network/relayer/config/config.yaml index caf8a07..c596326 100644 --- a/network/relayer/config/config.yaml +++ b/network/relayer/config/config.yaml @@ -5,7 +5,7 @@ global: chains: - type: cosmos value: - key: rly1 + key: rly chain-id: defund rpc-addr: http://localhost:26657 account-prefix: defund @@ -18,7 +18,7 @@ chains: sign-mode: direct - type: cosmos value: - key: rly2 + key: rly chain-id: osmo-test-4 rpc-addr: http://143.198.139.33:26657 account-prefix: osmo diff --git a/network/relayer/keys/defund/keyring-test/dcade2a6524043feda8e01e2773c8d29d4815889.address b/network/relayer/keys/defund/keyring-test/dcade2a6524043feda8e01e2773c8d29d4815889.address index c6085a2..51fb37a 100644 --- a/network/relayer/keys/defund/keyring-test/dcade2a6524043feda8e01e2773c8d29d4815889.address +++ b/network/relayer/keys/defund/keyring-test/dcade2a6524043feda8e01e2773c8d29d4815889.address @@ -1 +1 @@ -eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMi0wNy0yNSAwMDoxMTozNy4zNjU0Nzc0IC0wNTAwIENEVCBtPSswLjA4MzYzODIwMSIsImVuYyI6IkEyNTZHQ00iLCJwMmMiOjgxOTIsInAycyI6Ii1KdmpZWDFrblZac0FYQl8ifQ.iy7zsoX-o39vQqDJBcUWG34FB3q6Psh5tl8pVoCpGUYMx9cMNkLTKw.7HTklh3iOGLmR3Kw.qMsysikA9SfYVgE17WA4Wk30stsa3JysvyUjqJbjkWJQhcD_6xOONLs6-ryKhHd0E7vIESBJVb5bfQJvP7D3H0CzCoP8Hkx2g9IKiBrWRdvYJekUwZKzpMQ2NiMTzLyPcKXMU9DPftyZqUEk5WpIq6GmowmjZ1jfUb9CWT9GvSbcsE6y8Wu__zmFJm8BQUmjsdMzchSsqQcNSvP3F11bJH8Tz-ddPqBELxyRHkoFwExEMA.Jc08pnoQo8gBymjTpRt79A \ No newline at end of file +eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMi0wNy0yNSAwMzoxODo0OC4wNzA0MTE5IC0wNTAwIENEVCBtPSswLjA5NTc5NjkwMSIsImVuYyI6IkEyNTZHQ00iLCJwMmMiOjgxOTIsInAycyI6Ii1Ha2xzdmVzX0JyUGowZm8ifQ.o9jpegh0KaRWIgQ1QC-gwjFbrzlU0sEf-YyEHiq-5WHg8DNBh0bkaA.TQt_36PVkerhb4f8.1WCQ_mQoVXT3i_d0P3J4jpEqdakEn9fMkn3eeEjr5DOw8zvyC7lZ1XjeJHy590zt_srIDZhcqmua8dwgBMG92YbreQo929JoYY52sctM6Ms_zjzlLveFpoIqpN8g_fBzKgDj31s-1w7G3WPwnS76V51lyr_JOmV38SqG6E14dfAfJH3HhhpYTXkKL7ffS0fzCld90l4-nFDuZ9EcLQJlJAoCvDt4ZhLNaDRaFeOmZ516YQ.YfTpsXTzo8eX8luwZYcypg \ No newline at end of file diff --git a/network/relayer/keys/defund/keyring-test/rly.info b/network/relayer/keys/defund/keyring-test/rly.info new file mode 100644 index 0000000..abff0d2 --- /dev/null +++ b/network/relayer/keys/defund/keyring-test/rly.info @@ -0,0 +1 @@ +eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMi0wNy0yNSAwMzoxODo0OC4wNjQ1NzAxIC0wNTAwIENEVCBtPSswLjA4OTk1NTEwMSIsImVuYyI6IkEyNTZHQ00iLCJwMmMiOjgxOTIsInAycyI6Im1SeTY0ZjNodHM2dTAtVFkifQ.gjHukUl_xxuWG331SgSsMB0MpeBttXEA6x2ROlbSKkvntZYWTAiI6A.7FRhIlJ3Ik1WAtCD.uiB4KlsAx-1nnAnY9BLaegdK1_DhWu4b9vDN2tNwAxi4RHOLGdrHRkbLcHZ0kRFV3ioTb6PRMbqy7cWeynKQ-DIYTGob3scjHUAd1kjZ0HyPCq_2_y79cbBw87wNOMLw3mIjUF18e5-54TNiPHTJFVh9DXqXYVaKZsP9LmBGArxcCXHaNZY4BgwBKJVpZdU_dBs6A3adscpNcbpUEvJQ18Q7uGHBEUSEYFFAuT0tsmmsXhl3xcEQphCXdhJTWrUMGcrHHn_2Yf6cH3KR8A9sh534HA0f0Isb2uV_9mvnVvJj2RCuof-XZx8mdl31FcLITS5ckod9qSFczwRIy4Nz8PTdWe-Rlg.NjJREPucYjxpd3M2Wc8PIw \ No newline at end of file diff --git a/network/relayer/keys/defund/keyring-test/rly1.info b/network/relayer/keys/defund/keyring-test/rly1.info deleted file mode 100644 index 2a8c26d..0000000 --- a/network/relayer/keys/defund/keyring-test/rly1.info +++ /dev/null @@ -1 +0,0 @@ -eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMi0wNy0yNSAwMDoxMTozNy4zNjAwMDM4IC0wNTAwIENEVCBtPSswLjA3ODE2NDcwMSIsImVuYyI6IkEyNTZHQ00iLCJwMmMiOjgxOTIsInAycyI6IllzZ3d0U1dVODBxUzBuVXQifQ.hDsFgIzX74_HFtOp7Dbg6KG51QgoFTdxbDZwPKMFX1k-SGeH4noPuw.iC2I-hNEEd8ZBQWL.3h_I_rj4oxt0X0GuUgLPSLLz7zj8aTLa1JFv-6BPKvG383maDUdShQQv3Z5rFuEMq2b03WpkCtSjNrpGa-5fZ6rOb9XeCvvkCS_rlBCKbcfpR4PDPFyTsDqmisEn6HRSTnBMWhkTs80QtoLIDItko8bKoCaLY265Tf50h0pkZ0bUXOEMomX5T94rQxRoMrXmNo_y73AIB77YSZJUPCJOYAHdB4544Dlcm9BWImu49bns9QAnHVd4PnqQ9qR4V_ozd2khpDH3gud5NTUQFQIOK2FclJfyQJczND8df0VjT5Bv-EBLgUZXhR8VujMAmhATRT9x1n5oM9gPyVPPCmb90KaynIbMwqk.L3Om8gecERfrfdaLot8rsg \ No newline at end of file diff --git a/network/relayer/keys/osmo-test-4/keyring-test/f357f7ee4b8afdeb079742b2d00a4180b9f75d02.address b/network/relayer/keys/osmo-test-4/keyring-test/f357f7ee4b8afdeb079742b2d00a4180b9f75d02.address index ebca6a6..51c7917 100644 --- a/network/relayer/keys/osmo-test-4/keyring-test/f357f7ee4b8afdeb079742b2d00a4180b9f75d02.address +++ b/network/relayer/keys/osmo-test-4/keyring-test/f357f7ee4b8afdeb079742b2d00a4180b9f75d02.address @@ -1 +1 @@ -eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMi0wNy0yNSAwMDoxMTo0Mi40NzUyOTgxIC0wNTAwIENEVCBtPSswLjA5NzcyODMwMSIsImVuYyI6IkEyNTZHQ00iLCJwMmMiOjgxOTIsInAycyI6IkdlNE5ydGtfQmY0NTVxd0sifQ.sX6XybJcasPToBfxk-_sulTfSY6LBysVXGcusNrwZKh3q1meA2ye1A.tfSQIFx51oZLTz9E.yyrB0Y1-zNuLVqsHw1WT2nSv3iZua-sQ0-R4wqfG7GtFRXsn2YtCYABwRYuKu8Zu-xw1HLJUce1E76iaptlhWhizouyCX3CR49Hp1WbWOULbVGqapRJ2w1hpV6lOvYY3d6xlOyqK-vM76V4WTEKkX0FPaFQ6-7NKuJwgyVpm5rYElI_-c02FI5Y81CL7RFFxh4wO9FAKu04pq2uC41_il2WX995T4sUdTHnq3aW71HQQRw.ZozPZApdGCiVLz6E5GKgOw \ No newline at end of file +eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMi0wNy0yNSAwMzoxODo1My4xODgyMTg4IC0wNTAwIENEVCBtPSswLjEwNjY1NzMwMSIsImVuYyI6IkEyNTZHQ00iLCJwMmMiOjgxOTIsInAycyI6InlWazBCaEo5cW5JamoyYXIifQ.pEJ1_Ex8jDgo_YYwMc5emCgED54HxE-GqSZqSJlOcsL7CGiyZtYQ_Q.TZfb1OgWFRWbnqQZ.k7KyyhIulVtkyAzqr9X4q7Caxm0TMxl2tUsIyjLRbvTa3xJQ9z2wiURXQpCFJdUudquaGZ7qyZM9yCIyhCLh0rPFEwJBIiVmJKuj8-lGiVrHftQl2Zl6rer8t1RpoN39V9xc2oMLXKteqg8kfZXtm-3FWALIRA3zgMWVA8Hs_iWA8RKjtPrEP1_HSrW--ZbIlozIAP39cIouZw89wp8LQ7vyqorWlbYOxo8Wmbn301qQCg.7IgfStmucrmJu5egQq4VOQ \ No newline at end of file diff --git a/network/relayer/keys/osmo-test-4/keyring-test/rly.info b/network/relayer/keys/osmo-test-4/keyring-test/rly.info new file mode 100644 index 0000000..e556b4f --- /dev/null +++ b/network/relayer/keys/osmo-test-4/keyring-test/rly.info @@ -0,0 +1 @@ +eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMi0wNy0yNSAwMzoxODo1My4xODIyOSAtMDUwMCBDRFQgbT0rMC4xMDA3Mjg2MDEiLCJlbmMiOiJBMjU2R0NNIiwicDJjIjo4MTkyLCJwMnMiOiJyOGEzdEVUMXRhQW9iZ0wxIn0.ThV5KbIo-RWqAyHNQs3-YtvIe2KzzpKW2JXz5zZUZDDVcCB98qGbNQ.hrMLY7DM0BT6Zup5.GLhtMWVNulQWoKeLOXl8aGM9Pl87nxcIKu_AoeU5Ij5xaSvcnJHwIeaRRqUmK2TyCtMngkk64ik_njUpX0l7VQy6E_ckwx7pq7We0gfxmHN5KRKjHDfcgdkRj7U1g2UMDQk8qMYAIDINjDqyPQnbY6p6TAz1PXkqeUDZCHn0X1HP_sK0VRDLZ--fRZ-ti0st_IZn6qhHV9WwM8QrE0ipQNLPU9lD6D7NaAa8Rm0MnwdJvm3bTZV9UihisrDTBQa-QwV9iTnDhRuOenW7j1zso0DIffOUOswchrQzDple1GGHChUEnuOLZeR1zjsGCriHjEqsF_tK26YVK8zlH2fql1fBH706cg.AS5Fymh42s61rZ_dEJa59w \ No newline at end of file diff --git a/network/relayer/keys/osmo-test-4/keyring-test/rly2.info b/network/relayer/keys/osmo-test-4/keyring-test/rly2.info deleted file mode 100644 index bfb237b..0000000 --- a/network/relayer/keys/osmo-test-4/keyring-test/rly2.info +++ /dev/null @@ -1 +0,0 @@ -eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMi0wNy0yNSAwMDoxMTo0Mi40Njk1NjYyIC0wNTAwIENEVCBtPSswLjA5MTk5NjYwMSIsImVuYyI6IkEyNTZHQ00iLCJwMmMiOjgxOTIsInAycyI6Ik9CYjVqdXhrR3laT1BSQUcifQ.MhZyuwnv2tkC4Y2qVSc2375xEKUK_t5S84GmiEx78kkjp3Xo2whX4w.1vYl46ytjM2wqOeU.YGiUSmDWN3QWGzxqXo1L9PAwKN6fF1hNszp7bonWJRPfezINvk1QuVQkB5VV2lrP_sm0y-4cu7ofBlIqgDl_1mluob1HhklOonU-TV_Yat6CZxvE81e5o5XATmI6lN7oAu1-gA5n9YOrTI0u3nPB3tyIacoiwcs-L4Lp8k7SMPxGvYYcZSHJoWSmgmxZdYg-cEUuzNfRJgTlaekkAvsJYlQkXUj-5DtEUZ8KkhJIZePB4pWt6rrRP-GMxPyrIgXM6395zdkcQcrxqGpiQtqL509xmvWo9-Fbu_b68rzjafanFQwn5_MY9H1HAtY91fDeplM8rkhIhsaGhUIcQ9I7TwvSAj0jm90.I_U9nHpFMRxdMz_tFlH0SA \ No newline at end of file diff --git a/network/relayer/restore-keys.sh b/network/relayer/restore-keys.sh index 0a79254..621d5c0 100755 --- a/network/relayer/restore-keys.sh +++ b/network/relayer/restore-keys.sh @@ -11,8 +11,8 @@ fi sleep 1s ### Restore Keys -rly keys restore defund rly1 "alley afraid soup fall idea toss can goose become valve initial strong forward bright dish figure check leopard decide warfare hub unusual join cart" --home $RELAYER_DIRECTORY +rly keys restore defund rly "alley afraid soup fall idea toss can goose become valve initial strong forward bright dish figure check leopard decide warfare hub unusual join cart" --home $RELAYER_DIRECTORY sleep 5s -rly keys restore osmo-test-4 rly2 "record gift you once hip style during joke field prize dust unique length more pencil transfer quit train device arrive energy sort steak upset" --home $RELAYER_DIRECTORY +rly keys restore osmo-test-4 rly "record gift you once hip style during joke field prize dust unique length more pencil transfer quit train device arrive energy sort steak upset" --home $RELAYER_DIRECTORY sleep 5s diff --git a/proto/query/interquery.proto b/proto/query/interquery.proto index 142bd30..dc90a08 100644 --- a/proto/query/interquery.proto +++ b/proto/query/interquery.proto @@ -12,6 +12,7 @@ message Interquery { bytes key = 4; uint64 timeoutHeight = 5; string connectionId = 6; + string clientId = 7; } message InterqueryResult { diff --git a/x/query/keeper/keeper.go b/x/query/keeper/keeper.go index c8b19ed..25ef67b 100644 --- a/x/query/keeper/keeper.go +++ b/x/query/keeper/keeper.go @@ -8,6 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/address" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + connectiontypes "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types" "github.com/defund-labs/defund/x/query/types" ) @@ -61,6 +63,11 @@ func (k Keeper) NewQueryAddress(id uint64) sdk.AccAddress { } func (k Keeper) CreateInterqueryRequest(ctx sdk.Context, chainid string, storeid string, path string, key []byte, timeoutheight uint64, connectionid string) error { + // get the connection from store + connection, found := k.connectionKeeper.GetConnection(ctx, connectionid) + if !found { + return sdkerrors.Wrapf(connectiontypes.ErrConnectionNotFound, "connection %s not found", connectionid) + } interquery := types.Interquery{ Storeid: storeid, Chainid: chainid, @@ -68,6 +75,7 @@ func (k Keeper) CreateInterqueryRequest(ctx sdk.Context, chainid string, storeid Key: key, TimeoutHeight: timeoutheight, ConnectionId: connectionid, + ClientId: connection.ClientId, } k.SetInterquery(ctx, interquery) diff --git a/x/query/types/interquery.pb.go b/x/query/types/interquery.pb.go index 45ac2bf..7ff8aec 100644 --- a/x/query/types/interquery.pb.go +++ b/x/query/types/interquery.pb.go @@ -30,6 +30,7 @@ type Interquery struct { Key []byte `protobuf:"bytes,4,opt,name=key,proto3" json:"key,omitempty"` TimeoutHeight uint64 `protobuf:"varint,5,opt,name=timeoutHeight,proto3" json:"timeoutHeight,omitempty"` ConnectionId string `protobuf:"bytes,6,opt,name=connectionId,proto3" json:"connectionId,omitempty"` + ClientId string `protobuf:"bytes,7,opt,name=clientId,proto3" json:"clientId,omitempty"` } func (m *Interquery) Reset() { *m = Interquery{} } @@ -107,6 +108,13 @@ func (m *Interquery) GetConnectionId() string { return "" } +func (m *Interquery) GetClientId() string { + if m != nil { + return m.ClientId + } + return "" +} + type InterqueryResult struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Storeid string `protobuf:"bytes,2,opt,name=storeid,proto3" json:"storeid,omitempty"` @@ -260,29 +268,30 @@ func init() { func init() { proto.RegisterFile("query/interquery.proto", fileDescriptor_edfa9beb887ed5f4) } var fileDescriptor_edfa9beb887ed5f4 = []byte{ - // 353 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0xc1, 0x4e, 0xc2, 0x40, - 0x10, 0x65, 0x01, 0x41, 0x37, 0x98, 0x90, 0x3d, 0xe0, 0xc6, 0xc4, 0x86, 0x34, 0x1e, 0x48, 0x8c, - 0xf4, 0xe0, 0x1f, 0x98, 0x98, 0xc8, 0xb5, 0xf1, 0xa2, 0xb7, 0xb2, 0x3b, 0xd0, 0x8d, 0xb0, 0x5b, - 0xb7, 0x53, 0x63, 0xff, 0xc2, 0x4f, 0xf1, 0x0b, 0x3c, 0x7b, 0xe4, 0xe8, 0xd1, 0xc0, 0x8f, 0x98, - 0x6e, 0x8b, 0x40, 0x90, 0xdb, 0x7b, 0xf3, 0x32, 0x93, 0xf7, 0x26, 0x8f, 0xf6, 0x5e, 0x32, 0xb0, - 0x79, 0xa0, 0x34, 0x82, 0x75, 0x70, 0x98, 0x58, 0x83, 0x86, 0xf5, 0x24, 0x4c, 0x32, 0x2d, 0xe3, - 0x6c, 0x3c, 0x2c, 0xd1, 0xd0, 0xa9, 0xe7, 0x17, 0x08, 0x5a, 0x82, 0x9d, 0x2b, 0x8d, 0x81, 0xb0, - 0x79, 0x82, 0x26, 0x48, 0xac, 0x31, 0x93, 0x72, 0xcd, 0xff, 0x20, 0x94, 0x8e, 0xfe, 0x6e, 0x31, - 0x4e, 0xdb, 0x29, 0x1a, 0x0b, 0x4a, 0x72, 0xd2, 0x27, 0x83, 0x93, 0x70, 0x4d, 0x0b, 0x45, 0xc4, - 0x91, 0xd2, 0x4a, 0xf2, 0x7a, 0xa9, 0x54, 0x94, 0x31, 0xda, 0x4c, 0x22, 0x8c, 0x79, 0xc3, 0x8d, - 0x1d, 0x66, 0x5d, 0xda, 0x78, 0x86, 0x9c, 0x37, 0xfb, 0x64, 0xd0, 0x09, 0x0b, 0xc8, 0x2e, 0xe9, - 0x29, 0xaa, 0x39, 0x98, 0x0c, 0xef, 0x41, 0x4d, 0x63, 0xe4, 0x47, 0x7d, 0x32, 0x68, 0x86, 0xbb, - 0x43, 0xe6, 0xd3, 0x8e, 0x30, 0x5a, 0x83, 0x40, 0x65, 0xf4, 0x48, 0xf2, 0x96, 0xbb, 0xb9, 0x33, - 0xf3, 0x3f, 0x09, 0xed, 0x6e, 0x2c, 0x87, 0x90, 0x66, 0x33, 0x74, 0xf6, 0x2c, 0x44, 0x68, 0xec, - 0xda, 0x78, 0x45, 0xb7, 0x23, 0xd5, 0x0f, 0x46, 0x6a, 0xec, 0x45, 0x92, 0x11, 0x46, 0x95, 0x7f, - 0x87, 0x59, 0x8f, 0xb6, 0xe2, 0x6d, 0xe7, 0x15, 0x73, 0xf7, 0x33, 0x21, 0x20, 0x4d, 0x9d, 0xdb, - 0xe3, 0x70, 0x4d, 0x8b, 0x8d, 0xc4, 0x9a, 0x57, 0x90, 0xbc, 0xed, 0x84, 0x8a, 0xf9, 0x8f, 0xf4, - 0x6c, 0xe3, 0xff, 0xa1, 0xcc, 0xbf, 0x89, 0x71, 0xe0, 0xff, 0x7b, 0xff, 0xab, 0xff, 0xf3, 0xbf, - 0xdb, 0xbb, 0xaf, 0xa5, 0x47, 0x16, 0x4b, 0x8f, 0xfc, 0x2c, 0x3d, 0xf2, 0xbe, 0xf2, 0x6a, 0x8b, - 0x95, 0x57, 0xfb, 0x5e, 0x79, 0xb5, 0xa7, 0xab, 0xa9, 0xc2, 0xa2, 0x1c, 0xc2, 0xcc, 0x83, 0xb2, - 0x20, 0xd7, 0xb3, 0x68, 0x9c, 0x56, 0x38, 0x78, 0x0b, 0xca, 0x5e, 0x61, 0x9e, 0x40, 0x3a, 0x6e, - 0xb9, 0x72, 0xdc, 0xfc, 0x06, 0x00, 0x00, 0xff, 0xff, 0xba, 0x1f, 0x24, 0xbb, 0x6d, 0x02, 0x00, + // 369 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xcf, 0x6e, 0xe2, 0x30, + 0x10, 0xc6, 0x31, 0xb0, 0xc0, 0x5a, 0xac, 0x84, 0x7c, 0x60, 0x2d, 0xa4, 0x8d, 0x50, 0xb4, 0x07, + 0xa4, 0xaa, 0xe4, 0xd0, 0x37, 0xa8, 0x54, 0xa9, 0x5c, 0xa3, 0x5e, 0xda, 0x5b, 0xb0, 0x07, 0x62, + 0x15, 0xec, 0xd4, 0x99, 0x54, 0xcd, 0x5b, 0xf4, 0x89, 0x7a, 0xee, 0xa1, 0x07, 0x8e, 0x3d, 0x56, + 0xf0, 0x22, 0x55, 0x9c, 0xf0, 0x4f, 0x94, 0xdb, 0xf7, 0xcd, 0xc8, 0xa3, 0xf9, 0x8d, 0x3f, 0xda, + 0x7f, 0xca, 0xc0, 0xe6, 0x81, 0xd2, 0x08, 0xd6, 0xc9, 0x71, 0x62, 0x0d, 0x1a, 0xd6, 0x97, 0x30, + 0xcb, 0xb4, 0x8c, 0xb3, 0xe9, 0xb8, 0x54, 0x63, 0xd7, 0x1d, 0xfc, 0x43, 0xd0, 0x12, 0xec, 0x52, + 0x69, 0x0c, 0x84, 0xcd, 0x13, 0x34, 0x41, 0x62, 0x8d, 0x99, 0x95, 0xcf, 0xfc, 0x0f, 0x42, 0xe9, + 0x64, 0x37, 0x8b, 0x71, 0xda, 0x4e, 0xd1, 0x58, 0x50, 0x92, 0x93, 0x21, 0x19, 0xfd, 0x0e, 0xb7, + 0xb6, 0xe8, 0x88, 0x38, 0x52, 0x5a, 0x49, 0x5e, 0x2f, 0x3b, 0x95, 0x65, 0x8c, 0x36, 0x93, 0x08, + 0x63, 0xde, 0x70, 0x65, 0xa7, 0x59, 0x8f, 0x36, 0x1e, 0x21, 0xe7, 0xcd, 0x21, 0x19, 0x75, 0xc3, + 0x42, 0xb2, 0xff, 0xf4, 0x0f, 0xaa, 0x25, 0x98, 0x0c, 0x6f, 0x41, 0xcd, 0x63, 0xe4, 0xbf, 0x86, + 0x64, 0xd4, 0x0c, 0x8f, 0x8b, 0xcc, 0xa7, 0x5d, 0x61, 0xb4, 0x06, 0x81, 0xca, 0xe8, 0x89, 0xe4, + 0x2d, 0x37, 0xf3, 0xa8, 0xc6, 0x06, 0xb4, 0x23, 0x16, 0x0a, 0x34, 0x4e, 0x24, 0x6f, 0xbb, 0xfe, + 0xce, 0xfb, 0x6f, 0x84, 0xf6, 0xf6, 0x38, 0x21, 0xa4, 0xd9, 0x02, 0xdd, 0xea, 0x16, 0x22, 0x34, + 0x76, 0x0b, 0x55, 0xd9, 0x43, 0xdc, 0xfa, 0x59, 0xdc, 0xc6, 0x09, 0xae, 0x8c, 0x30, 0xaa, 0xd8, + 0x9c, 0x66, 0x7d, 0xda, 0x8a, 0x0f, 0xa9, 0x2a, 0xe7, 0xe6, 0x67, 0x42, 0x40, 0x9a, 0x3a, 0x92, + 0x4e, 0xb8, 0xb5, 0xc5, 0x8b, 0xc4, 0x9a, 0x67, 0x28, 0x11, 0x3a, 0x61, 0xe5, 0xfc, 0x7b, 0xfa, + 0x77, 0xbf, 0xff, 0x5d, 0x79, 0x9b, 0x3d, 0xc6, 0x99, 0xbf, 0x39, 0xb9, 0x6d, 0xfd, 0x87, 0xdb, + 0x5e, 0xdf, 0xbc, 0xaf, 0x3d, 0xb2, 0x5a, 0x7b, 0xe4, 0x6b, 0xed, 0x91, 0xd7, 0x8d, 0x57, 0x5b, + 0x6d, 0xbc, 0xda, 0xe7, 0xc6, 0xab, 0x3d, 0x5c, 0xcc, 0x15, 0x16, 0xc1, 0x11, 0x66, 0x19, 0x94, + 0xe1, 0xb9, 0x5c, 0x44, 0xd3, 0xb4, 0xd2, 0xc1, 0x4b, 0x50, 0x66, 0x0e, 0xf3, 0x04, 0xd2, 0x69, + 0xcb, 0x05, 0xe7, 0xea, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x53, 0xd5, 0x57, 0x89, 0x02, 0x00, 0x00, } @@ -306,6 +315,13 @@ func (m *Interquery) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.ClientId) > 0 { + i -= len(m.ClientId) + copy(dAtA[i:], m.ClientId) + i = encodeVarintInterquery(dAtA, i, uint64(len(m.ClientId))) + i-- + dAtA[i] = 0x3a + } if len(m.ConnectionId) > 0 { i -= len(m.ConnectionId) copy(dAtA[i:], m.ConnectionId) @@ -500,6 +516,10 @@ func (m *Interquery) Size() (n int) { if l > 0 { n += 1 + l + sovInterquery(uint64(l)) } + l = len(m.ClientId) + if l > 0 { + n += 1 + l + sovInterquery(uint64(l)) + } return n } @@ -769,6 +789,38 @@ func (m *Interquery) Unmarshal(dAtA []byte) error { } m.ConnectionId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowInterquery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthInterquery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthInterquery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ClientId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipInterquery(dAtA[iNdEx:])