From 6ee8febd84fddb4cbe73f6836a6051c2ee7bbe59 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 10:37:17 -0800 Subject: [PATCH 1/7] build(deps): Bump github.com/spf13/viper from 1.14.0 to 1.15.0 (#1726) (#1730) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.14.0 to 1.15.0.
Release notes

Sourced from github.com/spf13/viper's releases.

v1.15.0

What's Changed

Exciting New Features 🎉

Enhancements 🚀

Breaking Changes đź› 

Dependency Updates ⬆️

New Contributors

Full Changelog: https://github.com/spf13/viper/compare/v1.14.0...v1.15.0

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/spf13/viper&package-manager=go_modules&previous-version=1.14.0&new-version=1.15.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
(cherry picked from commit 403c01943cc5e074bef22e6e6bc7035d368afc8d) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 27 +++++++++++++-------------- go.sum | 56 +++++++++++++++++++++++++++----------------------------- 2 files changed, 40 insertions(+), 43 deletions(-) diff --git a/go.mod b/go.mod index 2773ddefc5..10d287d425 100644 --- a/go.mod +++ b/go.mod @@ -25,11 +25,11 @@ require ( github.com/rs/zerolog v1.28.0 github.com/spf13/cast v1.5.0 github.com/spf13/cobra v1.6.1 - github.com/spf13/viper v1.14.0 + github.com/spf13/viper v1.15.0 github.com/stretchr/testify v1.8.1 github.com/tendermint/tendermint v0.34.24 github.com/tendermint/tm-db v0.6.7 - google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 + google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef google.golang.org/grpc v1.52.0 gopkg.in/yaml.v3 v3.0.1 mvdan.cc/gofumpt v0.4.0 @@ -38,9 +38,9 @@ require ( require ( 4d63.com/gochecknoglobals v0.1.0 // indirect cloud.google.com/go v0.105.0 // indirect - cloud.google.com/go/compute v1.12.1 // indirect - cloud.google.com/go/compute/metadata v0.2.1 // indirect - cloud.google.com/go/iam v0.7.0 // indirect + cloud.google.com/go/compute v1.14.0 // indirect + cloud.google.com/go/compute/metadata v0.2.3 // indirect + cloud.google.com/go/iam v0.8.0 // indirect cloud.google.com/go/storage v1.27.0 // indirect filippo.io/edwards25519 v1.0.0-rc.1 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect @@ -155,8 +155,8 @@ require ( github.com/google/orderedcode v0.0.1 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/google/uuid v1.3.0 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect - github.com/googleapis/gax-go/v2 v2.6.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.2.1 // indirect + github.com/googleapis/gax-go/v2 v2.7.0 // indirect github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect github.com/gorilla/handlers v1.5.1 // indirect github.com/gorilla/websocket v1.5.0 // indirect @@ -201,7 +201,7 @@ require ( github.com/lib/pq v1.10.6 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/lufeee/execinquery v1.2.1 // indirect - github.com/magiconair/properties v1.8.6 // indirect + github.com/magiconair/properties v1.8.7 // indirect github.com/manifoldco/promptui v0.9.0 // indirect github.com/maratori/testableexamples v1.0.0 // indirect github.com/maratori/testpackage v1.1.0 // indirect @@ -228,8 +228,7 @@ require ( github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc2 // indirect github.com/opencontainers/runc v1.1.3 // indirect - github.com/pelletier/go-toml v1.9.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.5 // indirect + github.com/pelletier/go-toml/v2 v2.0.6 // indirect github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect github.com/pkg/errors v0.9.1 // indirect @@ -263,13 +262,13 @@ require ( github.com/sivchari/tenv v1.7.0 // indirect github.com/sonatard/noctx v0.0.1 // indirect github.com/sourcegraph/go-diff v0.6.1 // indirect - github.com/spf13/afero v1.9.2 // indirect + github.com/spf13/afero v1.9.3 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - github.com/subosito/gotenv v1.4.1 // indirect + github.com/subosito/gotenv v1.4.2 // indirect github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect github.com/tdakkota/asciicheck v0.1.1 // indirect github.com/tendermint/btcd v0.1.1 // indirect @@ -295,7 +294,7 @@ require ( github.com/zondax/ledger-go v0.14.0 // indirect gitlab.com/bosi/decorder v0.2.3 // indirect go.etcd.io/bbolt v1.3.6 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/goleak v1.1.12 // indirect go.uber.org/multierr v1.8.0 // indirect @@ -312,7 +311,7 @@ require ( golang.org/x/text v0.5.0 // indirect golang.org/x/tools v0.2.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/api v0.102.0 // indirect + google.golang.org/api v0.107.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index cf1b928f51..d42b19502d 100644 --- a/go.sum +++ b/go.sum @@ -30,14 +30,14 @@ cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUM cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/bigtable v1.2.0/go.mod h1:JcVAOl45lrTmQfLj7T6TxyMzIN/3FGGcFm+2xVAli2o= -cloud.google.com/go/compute v1.12.1 h1:gKVJMEyqV5c/UnpzjjQbo3Rjvvqpr9B1DFSbJC4OXr0= -cloud.google.com/go/compute v1.12.1/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU= -cloud.google.com/go/compute/metadata v0.2.1 h1:efOwf5ymceDhK6PKMnnrTHP4pppY5L22mle96M1yP48= -cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM= +cloud.google.com/go/compute v1.14.0 h1:hfm2+FfxVmnRlh6LpB7cg1ZNU+5edAHmW679JePztk0= +cloud.google.com/go/compute v1.14.0/go.mod h1:YfLtxrj9sU4Yxv+sXzZkyPjEyPBZfXHUvjxega5vAdo= +cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= +cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= 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/iam v0.7.0 h1:k4MuwOsS7zGJJ+QfZ5vBK8SgHBAvYN/23BWsiihJ1vs= -cloud.google.com/go/iam v0.7.0/go.mod h1:H5Br8wRaDGNc8XP3keLc4unfUUZeyH3Sfl9XpQEYOeg= +cloud.google.com/go/iam v0.8.0 h1:E2osAkZzxI/+8pZcxVLcDtAQx/u+hZXVryUaYQ5O0Kk= +cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGESjkE= cloud.google.com/go/longrunning v0.3.0 h1:NjljC+FYPV3uh5/OwWT6pVU+doBqMg2x/rZlE+CamDs= 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= @@ -604,12 +604,12 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/enterprise-certificate-proxy v0.2.0 h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs= -github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= +github.com/googleapis/enterprise-certificate-proxy v0.2.1 h1:RY7tHKZcRlk788d5WSo/e83gOyyy742E8GSs771ySpg= +github.com/googleapis/enterprise-certificate-proxy v0.2.1/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= 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.6.0 h1:SXk3ABtQYDT/OH8jAyvEOQ58mgawq5C4o/4/89qN2ZU= -github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= +github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ= +github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 h1:PVRE9d4AQKmbelZ7emNig1+NT27DUmKZn5qXxfio54U= @@ -841,8 +841,8 @@ github.com/lufeee/execinquery v1.2.1 h1:hf0Ems4SHcUGBxpGN7Jz78z1ppVkP/837ZlETPCE github.com/lufeee/execinquery v1.2.1/go.mod h1:EC7DrEKView09ocscGHC+apXMIaorh4xqSxS/dy8SbM= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= -github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= +github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA= @@ -1007,10 +1007,8 @@ github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144T github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= -github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= -github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= +github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= +github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc= github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= @@ -1174,8 +1172,8 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw= -github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= +github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= @@ -1191,8 +1189,8 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU= -github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As= +github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= +github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= github.com/ssgreg/nlreturn/v2 v2.2.1 h1:X4XDI7jstt3ySqGU86YGAURbxw3oTDPK9sPEi6YEwQ0= github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 h1:Gb2Tyox57NRNuZ2d3rmvB3pcmbu7O1RS3m8WRx7ilrg= @@ -1219,8 +1217,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= -github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= +github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= +github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= @@ -1342,8 +1340,8 @@ 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/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= @@ -1640,7 +1638,7 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220609170525-579cf78fd858 h1:Dpdu/EMxGMFgq0CeYMh4fazTD2vtlZRYE7wyynxJb9U= +golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1765,8 +1763,8 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.102.0 h1:JxJl2qQ85fRMPNvlZY/enexbxpCjLwGhZUtgfGeQ51I= -google.golang.org/api v0.102.0/go.mod h1:3VFl6/fzoA+qNuS1N1/VfXY4LjoXN/wzeIp7TweWwGo= +google.golang.org/api v0.107.0 h1:I2SlFjD8ZWabaIFOfeEDg3pf0BHJDh6iYQ1ic3Yu/UU= +google.golang.org/api v0.107.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= 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= @@ -1820,8 +1818,8 @@ google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 h1:a2S6M0+660BgMNl++4JPlcAO/CjkqYItDEZwkoDQK7c= -google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= +google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef h1:uQ2vjV/sHTsWSqdKeLqmwitzgvjMl7o4IdtHwUDXSJY= +google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= From d4865a5393edbe86b53ecc7171ff88994fcb4db2 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 11:00:37 -0800 Subject: [PATCH 2/7] feat: register rc4 upgrade (#1729) (#1731) ## Description Registers the rc4 upgrade handler for the canon-2 testnet upgrade. --- ### Author Checklist _All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues._ I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] added appropriate labels to the PR - [ ] targeted the correct branch (see [PR Targeting](https://github.com/umee-network/umee/blob/main/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist _All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items._ I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable) (cherry picked from commit 0627615d6fb74fcd7d1bf45945f0db1f15e5043c) Co-authored-by: Adam Wozniak <29418299+adamewozniak@users.noreply.github.com> --- app/upgrades.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/upgrades.go b/app/upgrades.go index 3ded2a960a..398b317482 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -33,6 +33,18 @@ func (app UmeeApp) RegisterUpgradeHandlers(bool) { app.registerUpgrade3_2to3_3(upgradeInfo) app.registerUpgrade3_3to4_0(upgradeInfo) app.registerUpgrade4_0to4_0rc3(upgradeInfo) + app.registerUpgrade4_0rc3to4_0rc4(upgradeInfo) +} + +// performs upgrade from v4.0-rc3 -> v4.0-rc4 +func (app UmeeApp) registerUpgrade4_0rc3to4_0rc4(_ upgradetypes.Plan) { + const planName = "v4.0-rc4" + app.UpgradeKeeper.SetUpgradeHandler( + planName, + func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { + ctx.Logger().Info("Upgrade handler execution", "name", planName) + return fromVM, nil + }) } // performs upgrade from v4.0-rc2 (or rc1) -> v4.0-rc3 From cd780d4fe31eeb44573729a40ade463b815822da Mon Sep 17 00:00:00 2001 From: Adam Moser <63419657+toteki@users.noreply.github.com> Date: Thu, 9 Feb 2023 12:47:57 -0700 Subject: [PATCH 3/7] feat: Add error field in market summary --- proto/umee/leverage/v1/query.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/proto/umee/leverage/v1/query.proto b/proto/umee/leverage/v1/query.proto index f9516fb96b..ae6e4b1cf9 100644 --- a/proto/umee/leverage/v1/query.proto +++ b/proto/umee/leverage/v1/query.proto @@ -187,6 +187,7 @@ message QueryMarketSummaryResponse { (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = true ]; + string errors = 20; } // QueryAccountBalances defines the request structure for the AccountBalances gRPC service handler. From de6240aa2bf7c75dde360bf7d4d16b839bcde82d Mon Sep 17 00:00:00 2001 From: toteki <63419657+toteki@users.noreply.github.com> Date: Thu, 9 Feb 2023 12:54:21 -0700 Subject: [PATCH 4/7] make proto-all --- swagger/swagger.yaml | 4 + x/leverage/keeper/grpc_query.go | 6 +- x/leverage/types/query.pb.go | 227 +++++++++++++++++++------------- 3 files changed, 146 insertions(+), 91 deletions(-) diff --git a/swagger/swagger.yaml b/swagger/swagger.yaml index c9e43fcc08..cc07b38a01 100644 --- a/swagger/swagger.yaml +++ b/swagger/swagger.yaml @@ -454,6 +454,8 @@ paths: price is used if required medians is zero. Price is nil when the oracle is down or insufficient historic medians are available. + errors: + type: string description: >- QueryMarketSummaryResponse defines the response structure for the MarketSummary gRPC service handler. @@ -2228,6 +2230,8 @@ definitions: the leverage registry. Current price is used if required medians is zero. Price is nil when the oracle is down or insufficient historic medians are available. + errors: + type: string description: >- QueryMarketSummaryResponse defines the response structure for the MarketSummary gRPC service handler. diff --git a/x/leverage/keeper/grpc_query.go b/x/leverage/keeper/grpc_query.go index 65c3c77326..f427eeda7e 100644 --- a/x/leverage/keeper/grpc_query.go +++ b/x/leverage/keeper/grpc_query.go @@ -2,6 +2,7 @@ package keeper import ( "context" + "fmt" sdk "github.com/cosmos/cosmos-sdk/types" "google.golang.org/grpc/codes" @@ -138,8 +139,11 @@ func (q Querier) MarketSummary( if oraclePrice, _, oracleErr := q.Keeper.TokenPrice(ctx, req.Denom, types.PriceModeSpot); oracleErr == nil { resp.OraclePrice = &oraclePrice } - if historicPrice, _, historicErr := q.Keeper.TokenPrice(ctx, req.Denom, types.PriceModeHistoric); historicErr == nil { + historicPrice, historicN, historicErr := q.Keeper.TokenPrice(ctx, req.Denom, types.PriceModeHistoric) + if historicErr == nil { resp.OracleHistoricPrice = &historicPrice + } else { + resp.Errors += fmt.Sprintf("\nhistoric N \n %d, error \n %s", historicN, historicErr) } return &resp, nil diff --git a/x/leverage/types/query.pb.go b/x/leverage/types/query.pb.go index de398fc371..14a47f62fb 100644 --- a/x/leverage/types/query.pb.go +++ b/x/leverage/types/query.pb.go @@ -263,6 +263,7 @@ type QueryMarketSummaryResponse struct { AvailableCollateralize github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,18,opt,name=available_collateralize,json=availableCollateralize,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"available_collateralize"` // Oracle Historic Price is the historic USD value of a token. Historic price is defined as the median of the last N historic median prices from the oracle module, with N being this token's HistoricMedians in the leverage registry. Current price is used if required medians is zero. Price is nil when the oracle is down or insufficient historic medians are available. OracleHistoricPrice *github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,19,opt,name=oracle_historic_price,json=oracleHistoricPrice,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"oracle_historic_price,omitempty"` + Errors string `protobuf:"bytes,20,opt,name=errors,proto3" json:"errors,omitempty"` } func (m *QueryMarketSummaryResponse) Reset() { *m = QueryMarketSummaryResponse{} } @@ -805,97 +806,98 @@ func init() { func init() { proto.RegisterFile("umee/leverage/v1/query.proto", fileDescriptor_1e8137dcabb0ccc7) } var fileDescriptor_1e8137dcabb0ccc7 = []byte{ - // 1425 bytes of a gzipped FileDescriptorProto + // 1442 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x98, 0xcf, 0x6f, 0x1b, 0x45, - 0x14, 0xc7, 0xb3, 0x49, 0x9b, 0xc4, 0xcf, 0x71, 0x92, 0x4e, 0xd3, 0x66, 0xeb, 0xa6, 0xb6, 0xbb, - 0x6d, 0xda, 0xb4, 0x10, 0x6f, 0x53, 0x10, 0x12, 0x02, 0x09, 0xea, 0x16, 0x04, 0x28, 0xad, 0x52, - 0xb7, 0x05, 0xb5, 0x15, 0xb2, 0xc6, 0xbb, 0x23, 0x67, 0x95, 0xfd, 0xe1, 0xee, 0xae, 0x1d, 0x1b, - 0xa9, 0x17, 0x24, 0x8e, 0x48, 0x20, 0xc4, 0x81, 0x23, 0x57, 0xfe, 0x92, 0x1c, 0x2b, 0x71, 0x41, - 0x48, 0x04, 0x68, 0x2b, 0x0e, 0xfd, 0x07, 0xb8, 0xa2, 0x9d, 0x5f, 0xbb, 0xf1, 0xc6, 0x8d, 0xb3, - 0x22, 0xa7, 0x78, 0x77, 0xde, 0xfb, 0xbc, 0xef, 0xbc, 0x99, 0x7d, 0xf3, 0x26, 0xb0, 0xd4, 0x71, - 0x08, 0xd1, 0x6d, 0xd2, 0x25, 0x3e, 0x6e, 0x11, 0xbd, 0xbb, 0xa6, 0x3f, 0xe9, 0x10, 0xbf, 0x5f, - 0x6d, 0xfb, 0x5e, 0xe8, 0xa1, 0xf9, 0x68, 0xb4, 0x2a, 0x46, 0xab, 0xdd, 0xb5, 0xe2, 0x52, 0xcb, - 0xf3, 0x5a, 0x36, 0xd1, 0x71, 0xdb, 0xd2, 0xb1, 0xeb, 0x7a, 0x21, 0x0e, 0x2d, 0xcf, 0x0d, 0x98, - 0x7d, 0xb1, 0x94, 0xa2, 0xb5, 0x88, 0x4b, 0x02, 0x4b, 0x8c, 0x97, 0x53, 0xe3, 0x92, 0xcd, 0x0c, - 0x16, 0x5a, 0x5e, 0xcb, 0xa3, 0x3f, 0xf5, 0xe8, 0x97, 0xc0, 0x1a, 0x5e, 0xe0, 0x78, 0x81, 0xde, - 0xc4, 0x41, 0xe4, 0xd4, 0x24, 0x21, 0x5e, 0xd3, 0x0d, 0xcf, 0x72, 0xd9, 0xb8, 0x56, 0x80, 0xfc, - 0xdd, 0x48, 0xf5, 0x06, 0xf6, 0xb1, 0x13, 0x68, 0xb7, 0xe1, 0x64, 0xe2, 0xb1, 0x4e, 0x82, 0xb6, - 0xe7, 0x06, 0x04, 0xbd, 0x03, 0x93, 0x6d, 0xfa, 0x46, 0x55, 0x2a, 0xca, 0x4a, 0xfe, 0xba, 0x5a, - 0x1d, 0x9c, 0x5d, 0x95, 0x79, 0xd4, 0x8e, 0xed, 0xec, 0x96, 0xc7, 0xea, 0xdc, 0x5a, 0x5b, 0x84, - 0x53, 0x14, 0x57, 0x27, 0x2d, 0x2b, 0x08, 0x89, 0x4f, 0xcc, 0xfb, 0xde, 0x16, 0x71, 0x03, 0xed, - 0x11, 0x9c, 0xdb, 0x77, 0x40, 0x46, 0x7c, 0x17, 0xa6, 0x7d, 0x3a, 0xe6, 0xf7, 0x55, 0xa5, 0x32, - 0xb1, 0x92, 0xbf, 0xbe, 0x98, 0x8e, 0x49, 0x7d, 0x78, 0x48, 0x69, 0xae, 0x5d, 0x05, 0x44, 0xd9, - 0xb7, 0xb1, 0xbf, 0x45, 0xc2, 0x7b, 0x1d, 0xc7, 0xc1, 0x7e, 0x1f, 0x2d, 0xc0, 0x71, 0x93, 0xb8, - 0x9e, 0x43, 0x67, 0x90, 0xab, 0xb3, 0x07, 0xed, 0xe5, 0x0c, 0x14, 0xd3, 0xc6, 0x52, 0xc5, 0x79, - 0x98, 0x09, 0xfa, 0x4e, 0xd3, 0xb3, 0x1b, 0x49, 0xdf, 0x3c, 0x7b, 0x77, 0x2b, 0x7a, 0x85, 0x8a, - 0x30, 0x4d, 0x7a, 0x6d, 0xcf, 0x25, 0x6e, 0xa8, 0x8e, 0x57, 0x94, 0x95, 0x42, 0x5d, 0x3e, 0xa3, - 0xbb, 0x30, 0xe3, 0xf9, 0xd8, 0xb0, 0x49, 0xa3, 0xed, 0x5b, 0x06, 0x51, 0x27, 0x22, 0xf7, 0x5a, - 0x75, 0x67, 0xb7, 0xac, 0xfc, 0xbe, 0x5b, 0xbe, 0xd4, 0xb2, 0xc2, 0xcd, 0x4e, 0xb3, 0x6a, 0x78, - 0x8e, 0xce, 0x57, 0x89, 0xfd, 0x59, 0x0d, 0xcc, 0x2d, 0x3d, 0xec, 0xb7, 0x49, 0x50, 0xbd, 0x45, - 0x8c, 0x7a, 0x9e, 0x31, 0x36, 0x22, 0x04, 0xea, 0xc1, 0x42, 0x87, 0x4e, 0xbb, 0x41, 0x7a, 0xc6, - 0x26, 0x76, 0x5b, 0xa4, 0xe1, 0xe3, 0x90, 0xa8, 0xc7, 0x28, 0xfa, 0xe3, 0x28, 0x15, 0xa3, 0xa3, - 0x5f, 0xed, 0x96, 0x17, 0x3a, 0x61, 0x9a, 0x56, 0x47, 0x2c, 0xc6, 0x47, 0xfc, 0x65, 0x1d, 0x87, - 0x04, 0x3d, 0x06, 0x08, 0x3a, 0xed, 0xb6, 0xdd, 0x6f, 0xdc, 0xd8, 0x78, 0xa8, 0x1e, 0xa7, 0xf1, - 0xde, 0x3f, 0x74, 0x3c, 0xc1, 0xc0, 0xed, 0x7e, 0x3d, 0xc7, 0x7e, 0xdf, 0xd8, 0x78, 0x18, 0xc1, - 0x9b, 0x9e, 0xef, 0x7b, 0xdb, 0x14, 0x3e, 0x99, 0x15, 0xce, 0x19, 0x14, 0xce, 0x7e, 0x47, 0xf0, - 0xcf, 0x60, 0x9a, 0x46, 0xb2, 0x88, 0xa9, 0x4e, 0xc9, 0x25, 0x18, 0x15, 0xfd, 0xa9, 0x1b, 0xd6, - 0xa5, 0x7f, 0xc4, 0xf2, 0x49, 0x40, 0xfc, 0x2e, 0x31, 0xd5, 0xe9, 0x6c, 0x2c, 0xe1, 0x8f, 0xee, - 0x00, 0x18, 0x9e, 0x6d, 0xe3, 0x90, 0xf8, 0xd8, 0x56, 0x73, 0x99, 0x68, 0x09, 0x42, 0xa4, 0x8d, - 0x4d, 0x9a, 0x98, 0x2a, 0x64, 0xd3, 0x26, 0xfc, 0xd1, 0x3a, 0xe4, 0x6c, 0xeb, 0x49, 0xc7, 0x32, - 0xad, 0xb0, 0xaf, 0xe6, 0x33, 0xc1, 0x62, 0x00, 0x7a, 0x00, 0xb3, 0x0e, 0xee, 0x59, 0x4e, 0xc7, - 0x69, 0xb0, 0x08, 0xea, 0x4c, 0x26, 0x64, 0x81, 0x53, 0x6a, 0x14, 0x82, 0xbe, 0x04, 0x24, 0xb0, - 0x89, 0x44, 0x16, 0x32, 0xa1, 0x4f, 0x70, 0xd2, 0xcd, 0x38, 0x9f, 0x8f, 0xe1, 0x84, 0x63, 0xb9, - 0x14, 0x1f, 0xe7, 0x62, 0x36, 0x13, 0x7d, 0x9e, 0x83, 0xd6, 0x65, 0x4a, 0x4c, 0x28, 0xf0, 0x0f, - 0x99, 0x7d, 0x05, 0xea, 0x1c, 0x05, 0x7f, 0x70, 0x38, 0xf0, 0xab, 0xdd, 0x72, 0x81, 0x7f, 0xc1, - 0x0c, 0x53, 0x9f, 0x61, 0xd4, 0x7b, 0xf4, 0x09, 0x3d, 0x84, 0x79, 0xdc, 0xc5, 0x96, 0x8d, 0x9b, - 0x36, 0x11, 0xa9, 0x9f, 0xcf, 0x34, 0x83, 0x39, 0xc9, 0x89, 0x93, 0x1f, 0xa3, 0xb7, 0xad, 0x70, - 0xd3, 0xf4, 0xf1, 0xb6, 0x7a, 0x22, 0x5b, 0xf2, 0x25, 0xe9, 0x0b, 0x0e, 0x42, 0x2d, 0x58, 0x8c, - 0xf1, 0xf1, 0xea, 0x5a, 0x5f, 0x11, 0x15, 0x65, 0x8a, 0x71, 0x5a, 0xe2, 0x6e, 0x26, 0x69, 0xa8, - 0x09, 0xa7, 0x78, 0x91, 0xde, 0xb4, 0x82, 0xd0, 0xf3, 0x2d, 0x83, 0x57, 0xeb, 0x93, 0x99, 0xaa, - 0xf5, 0x49, 0x06, 0xfb, 0x84, 0xb3, 0x68, 0xd5, 0xd6, 0xae, 0xc1, 0x02, 0x3d, 0x65, 0x6e, 0x18, - 0x86, 0xd7, 0x71, 0xc3, 0x1a, 0xb6, 0xb1, 0x6b, 0x90, 0x00, 0xa9, 0x30, 0x85, 0x4d, 0xd3, 0x27, - 0x41, 0xc0, 0x8f, 0x16, 0xf1, 0xa8, 0xfd, 0x31, 0x0e, 0x4b, 0xfb, 0xb9, 0xc8, 0xa3, 0xa9, 0x95, - 0x28, 0x6a, 0xec, 0x80, 0x3c, 0x53, 0x65, 0x82, 0xaa, 0xd1, 0x59, 0x5f, 0xe5, 0x67, 0x7d, 0xf5, - 0xa6, 0x67, 0xb9, 0xb5, 0x6b, 0x51, 0xae, 0x7e, 0xf9, 0xb3, 0xbc, 0x32, 0xc2, 0x24, 0x22, 0x87, - 0x20, 0x51, 0xf1, 0xb6, 0xf6, 0x54, 0xa9, 0xf1, 0xff, 0x3f, 0x54, 0xb2, 0x84, 0xb5, 0x12, 0x25, - 0x6c, 0xe2, 0x08, 0x66, 0x25, 0xe0, 0x9a, 0xce, 0x1b, 0x1d, 0x9e, 0x5e, 0xd1, 0x25, 0x0c, 0x5f, - 0x90, 0xdd, 0x09, 0x38, 0xbb, 0x8f, 0x87, 0x5c, 0x8f, 0x07, 0x30, 0x2b, 0x52, 0xd6, 0xe8, 0x62, - 0xbb, 0x43, 0x18, 0xe0, 0x50, 0xdb, 0x34, 0xda, 0x3f, 0x05, 0x41, 0xf9, 0x3c, 0x82, 0x44, 0x1f, - 0x70, 0x9c, 0x1e, 0x0e, 0x1e, 0xcf, 0x04, 0x9e, 0x8b, 0x39, 0x0c, 0xfd, 0x00, 0x66, 0x45, 0x3a, - 0x38, 0x78, 0x22, 0x9b, 0x62, 0x41, 0x61, 0xd8, 0xbb, 0x30, 0xc3, 0x8f, 0x61, 0xdb, 0x72, 0xac, - 0x90, 0x77, 0x26, 0x87, 0x85, 0xe6, 0x19, 0x63, 0x3d, 0x42, 0x20, 0x03, 0x4e, 0xb1, 0x02, 0x4c, - 0x3b, 0xe6, 0x46, 0xb8, 0xe9, 0x93, 0x60, 0xd3, 0xb3, 0x4d, 0xde, 0x85, 0x1c, 0x96, 0xbd, 0x90, - 0x80, 0xdd, 0x17, 0x2c, 0xed, 0x0c, 0x2c, 0xd2, 0xf5, 0x5d, 0x4f, 0x0c, 0x62, 0xbf, 0x45, 0xc2, - 0x40, 0x7b, 0x0f, 0xca, 0x43, 0x86, 0xe4, 0xf2, 0xab, 0x30, 0x15, 0xb2, 0x57, 0xf4, 0x6b, 0xcc, - 0xd5, 0xc5, 0xa3, 0x36, 0x07, 0x05, 0xea, 0x5c, 0xc3, 0xe6, 0x2d, 0xd2, 0x0c, 0x03, 0xad, 0xce, - 0x9b, 0x62, 0xf1, 0x22, 0xd1, 0xf3, 0xee, 0x61, 0x44, 0x7b, 0x3f, 0xd5, 0xf2, 0x72, 0x27, 0xde, - 0xf4, 0xca, 0x20, 0x35, 0x98, 0xe7, 0x6d, 0x6c, 0x4f, 0x56, 0xd0, 0xa1, 0x7b, 0x39, 0xee, 0x85, - 0xc7, 0x93, 0xbd, 0xf0, 0x3f, 0x0a, 0xa8, 0x83, 0x10, 0xa9, 0x8d, 0xc0, 0x14, 0x3b, 0x58, 0x82, - 0xa3, 0xa8, 0x36, 0x82, 0x8d, 0x0c, 0x98, 0x0c, 0x59, 0x94, 0x23, 0x28, 0x34, 0x1c, 0xad, 0x7d, - 0x08, 0xb3, 0x62, 0x9e, 0xfc, 0x2c, 0x3b, 0x6c, 0xaa, 0x9e, 0xc2, 0xe9, 0xbd, 0x04, 0x99, 0xa7, - 0x78, 0x02, 0xca, 0x91, 0x4d, 0xe0, 0xfa, 0xbf, 0x39, 0x38, 0x4e, 0xe3, 0xa3, 0x36, 0x4c, 0xb2, - 0x8b, 0x17, 0x3a, 0x97, 0xde, 0x2b, 0x89, 0x9b, 0x5c, 0x71, 0xf9, 0xb5, 0xc3, 0x42, 0xbe, 0x56, - 0xf9, 0xfa, 0xd7, 0x97, 0x3f, 0x8c, 0x17, 0x91, 0xaa, 0xa7, 0xae, 0x9b, 0xec, 0x4a, 0x87, 0x7e, - 0x52, 0x60, 0x7e, 0xf0, 0xd6, 0x86, 0x2e, 0x0f, 0xa1, 0x0f, 0x1a, 0x16, 0xf5, 0x11, 0x0d, 0xa5, - 0xa0, 0x37, 0xa8, 0xa0, 0x65, 0x74, 0x21, 0x2d, 0xc8, 0x97, 0x3e, 0x0d, 0x96, 0x17, 0xf4, 0xad, - 0x02, 0x85, 0xbd, 0xb7, 0xbe, 0x8b, 0x43, 0xe2, 0xed, 0xb1, 0x2a, 0xbe, 0x39, 0x8a, 0x95, 0x94, - 0xb4, 0x42, 0x25, 0x69, 0xa8, 0x92, 0x96, 0xe4, 0x50, 0x87, 0x46, 0xc0, 0xa3, 0xff, 0xa8, 0xc0, - 0xdc, 0xe0, 0x91, 0x7f, 0x69, 0x48, 0xac, 0x01, 0xbb, 0x62, 0x75, 0x34, 0x3b, 0xa9, 0xea, 0x2a, - 0x55, 0x75, 0x11, 0x69, 0x69, 0x55, 0x98, 0xb9, 0x34, 0x9a, 0x42, 0xc3, 0xf7, 0x0a, 0xcc, 0x0e, - 0x1c, 0x7c, 0xcb, 0xaf, 0x0f, 0x27, 0x32, 0xb5, 0x3a, 0x92, 0x99, 0x14, 0x75, 0x85, 0x8a, 0xba, - 0x80, 0xce, 0x0f, 0x17, 0x25, 0x72, 0xf5, 0xb3, 0x02, 0x28, 0x5d, 0x5f, 0xd1, 0x95, 0x21, 0x01, - 0xd3, 0xa6, 0xc5, 0xb5, 0x91, 0x4d, 0xa5, 0xbe, 0x55, 0xaa, 0xef, 0x32, 0x5a, 0x4e, 0xeb, 0xdb, - 0x73, 0xe0, 0x70, 0x31, 0x7d, 0x98, 0x16, 0x45, 0x1b, 0x95, 0x87, 0x44, 0x13, 0x06, 0xc5, 0xcb, - 0x07, 0x18, 0x48, 0x11, 0x17, 0xa8, 0x88, 0x73, 0xe8, 0x6c, 0x5a, 0x44, 0x13, 0x9b, 0x0d, 0x93, - 0x86, 0xfb, 0x46, 0x81, 0x7c, 0xb2, 0xb8, 0x6b, 0x43, 0xb7, 0xac, 0xb4, 0x29, 0x5e, 0x3d, 0xd8, - 0x46, 0x8a, 0xb8, 0x44, 0x45, 0x54, 0x50, 0x69, 0xbf, 0x4d, 0xdd, 0x93, 0xfd, 0x3d, 0x7a, 0x0a, - 0xb9, 0xb8, 0x6c, 0x56, 0x86, 0x07, 0x60, 0x16, 0xc5, 0x95, 0x83, 0x2c, 0xa4, 0x80, 0x8b, 0x54, - 0x40, 0x09, 0x2d, 0xed, 0x2f, 0x80, 0xb5, 0x03, 0xb5, 0x3b, 0x3b, 0x7f, 0x97, 0xc6, 0x76, 0x9e, - 0x97, 0x94, 0x67, 0xcf, 0x4b, 0xca, 0x5f, 0xcf, 0x4b, 0xca, 0x77, 0x2f, 0x4a, 0x63, 0xcf, 0x5e, - 0x94, 0xc6, 0x7e, 0x7b, 0x51, 0x1a, 0x7b, 0x74, 0x2d, 0x51, 0x49, 0x23, 0xca, 0xaa, 0x4b, 0xc2, - 0x6d, 0xcf, 0xdf, 0x62, 0xc8, 0xee, 0xdb, 0x7a, 0x2f, 0xe6, 0xd2, 0xba, 0xda, 0x9c, 0xa4, 0xff, - 0x05, 0x7b, 0xeb, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd1, 0x3b, 0x6b, 0x8a, 0xcc, 0x13, 0x00, - 0x00, + 0x1b, 0xc7, 0xb3, 0x49, 0x9b, 0x1f, 0x8f, 0xe3, 0x24, 0x9d, 0xa6, 0xcd, 0xd6, 0x4d, 0x6d, 0x77, + 0xdb, 0xb4, 0x69, 0xdf, 0x37, 0xde, 0xa6, 0xef, 0x2b, 0x24, 0x04, 0x12, 0xd4, 0x2d, 0x08, 0x50, + 0x5a, 0xa5, 0x6e, 0x0b, 0x6a, 0x2b, 0x64, 0x8d, 0x77, 0x47, 0xce, 0x2a, 0xbb, 0x3b, 0xee, 0xec, + 0xda, 0xb1, 0x91, 0x7a, 0x41, 0xe2, 0x88, 0x04, 0x42, 0x1c, 0x38, 0x72, 0xe5, 0x2f, 0xc9, 0xb1, + 0x12, 0x17, 0x84, 0x44, 0x80, 0x16, 0x71, 0xe8, 0x3f, 0xc0, 0x85, 0x03, 0xda, 0x99, 0xd9, 0xf1, + 0xc6, 0x1b, 0xb7, 0xce, 0x8a, 0x9c, 0xe2, 0xd9, 0x79, 0x9e, 0xcf, 0xf3, 0x9d, 0x67, 0x66, 0x9f, + 0x79, 0x36, 0xb0, 0xdc, 0xf6, 0x08, 0x31, 0x5d, 0xd2, 0x21, 0x0c, 0x37, 0x89, 0xd9, 0x59, 0x37, + 0x9f, 0xb4, 0x09, 0xeb, 0x55, 0x5a, 0x8c, 0x86, 0x14, 0x2d, 0x44, 0xb3, 0x95, 0x78, 0xb6, 0xd2, + 0x59, 0x2f, 0x2c, 0x37, 0x29, 0x6d, 0xba, 0xc4, 0xc4, 0x2d, 0xc7, 0xc4, 0xbe, 0x4f, 0x43, 0x1c, + 0x3a, 0xd4, 0x0f, 0x84, 0x7d, 0xa1, 0x98, 0xa2, 0x35, 0x89, 0x4f, 0x02, 0x27, 0x9e, 0x2f, 0xa5, + 0xe6, 0x15, 0x5b, 0x18, 0x2c, 0x36, 0x69, 0x93, 0xf2, 0x9f, 0x66, 0xf4, 0x2b, 0xc6, 0x5a, 0x34, + 0xf0, 0x68, 0x60, 0x36, 0x70, 0x10, 0x39, 0x35, 0x48, 0x88, 0xd7, 0x4d, 0x8b, 0x3a, 0xbe, 0x98, + 0x37, 0xf2, 0x90, 0xbb, 0x1b, 0xa9, 0xde, 0xc4, 0x0c, 0x7b, 0x81, 0x71, 0x1b, 0x4e, 0x26, 0x86, + 0x35, 0x12, 0xb4, 0xa8, 0x1f, 0x10, 0xf4, 0x06, 0x4c, 0xb6, 0xf8, 0x13, 0x5d, 0x2b, 0x6b, 0xab, + 0xb9, 0xeb, 0x7a, 0x65, 0x70, 0x75, 0x15, 0xe1, 0x51, 0x3d, 0xb6, 0xbb, 0x57, 0x1a, 0xab, 0x49, + 0x6b, 0x63, 0x09, 0x4e, 0x71, 0x5c, 0x8d, 0x34, 0x9d, 0x20, 0x24, 0x8c, 0xd8, 0xf7, 0xe9, 0x36, + 0xf1, 0x03, 0xe3, 0x11, 0x9c, 0x3b, 0x70, 0x42, 0x45, 0x7c, 0x13, 0xa6, 0x19, 0x9f, 0x63, 0x3d, + 0x5d, 0x2b, 0x4f, 0xac, 0xe6, 0xae, 0x2f, 0xa5, 0x63, 0x72, 0x1f, 0x19, 0x52, 0x99, 0x1b, 0x57, + 0x01, 0x71, 0xf6, 0x6d, 0xcc, 0xb6, 0x49, 0x78, 0xaf, 0xed, 0x79, 0x98, 0xf5, 0xd0, 0x22, 0x1c, + 0xb7, 0x89, 0x4f, 0x3d, 0xbe, 0x82, 0x99, 0x9a, 0x18, 0x18, 0x7f, 0xcf, 0x42, 0x21, 0x6d, 0xac, + 0x54, 0x9c, 0x87, 0xd9, 0xa0, 0xe7, 0x35, 0xa8, 0x5b, 0x4f, 0xfa, 0xe6, 0xc4, 0xb3, 0x5b, 0xd1, + 0x23, 0x54, 0x80, 0x69, 0xd2, 0x6d, 0x51, 0x9f, 0xf8, 0xa1, 0x3e, 0x5e, 0xd6, 0x56, 0xf3, 0x35, + 0x35, 0x46, 0x77, 0x61, 0x96, 0x32, 0x6c, 0xb9, 0xa4, 0xde, 0x62, 0x8e, 0x45, 0xf4, 0x89, 0xc8, + 0xbd, 0x5a, 0xd9, 0xdd, 0x2b, 0x69, 0x3f, 0xef, 0x95, 0x2e, 0x35, 0x9d, 0x70, 0xab, 0xdd, 0xa8, + 0x58, 0xd4, 0x33, 0xe5, 0x2e, 0x89, 0x3f, 0x6b, 0x81, 0xbd, 0x6d, 0x86, 0xbd, 0x16, 0x09, 0x2a, + 0xb7, 0x88, 0x55, 0xcb, 0x09, 0xc6, 0x66, 0x84, 0x40, 0x5d, 0x58, 0x6c, 0xf3, 0x65, 0xd7, 0x49, + 0xd7, 0xda, 0xc2, 0x7e, 0x93, 0xd4, 0x19, 0x0e, 0x89, 0x7e, 0x8c, 0xa3, 0xdf, 0x8f, 0x52, 0x31, + 0x3a, 0xfa, 0xe5, 0x5e, 0x69, 0xb1, 0x1d, 0xa6, 0x69, 0x35, 0x24, 0x62, 0xbc, 0x27, 0x1f, 0xd6, + 0x70, 0x48, 0xd0, 0x63, 0x80, 0xa0, 0xdd, 0x6a, 0xb9, 0xbd, 0xfa, 0x8d, 0xcd, 0x87, 0xfa, 0x71, + 0x1e, 0xef, 0xed, 0x43, 0xc7, 0x8b, 0x19, 0xb8, 0xd5, 0xab, 0xcd, 0x88, 0xdf, 0x37, 0x36, 0x1f, + 0x46, 0xf0, 0x06, 0x65, 0x8c, 0xee, 0x70, 0xf8, 0x64, 0x56, 0xb8, 0x64, 0x70, 0xb8, 0xf8, 0x1d, + 0xc1, 0x3f, 0x82, 0x69, 0x1e, 0xc9, 0x21, 0xb6, 0x3e, 0xa5, 0xb6, 0x60, 0x54, 0xf4, 0x87, 0x7e, + 0x58, 0x53, 0xfe, 0x11, 0x8b, 0x91, 0x80, 0xb0, 0x0e, 0xb1, 0xf5, 0xe9, 0x6c, 0xac, 0xd8, 0x1f, + 0xdd, 0x01, 0xb0, 0xa8, 0xeb, 0xe2, 0x90, 0x30, 0xec, 0xea, 0x33, 0x99, 0x68, 0x09, 0x42, 0xa4, + 0x4d, 0x2c, 0x9a, 0xd8, 0x3a, 0x64, 0xd3, 0x16, 0xfb, 0xa3, 0x0d, 0x98, 0x71, 0x9d, 0x27, 0x6d, + 0xc7, 0x76, 0xc2, 0x9e, 0x9e, 0xcb, 0x04, 0xeb, 0x03, 0xd0, 0x03, 0x98, 0xf3, 0x70, 0xd7, 0xf1, + 0xda, 0x5e, 0x5d, 0x44, 0xd0, 0x67, 0x33, 0x21, 0xf3, 0x92, 0x52, 0xe5, 0x10, 0xf4, 0x29, 0xa0, + 0x18, 0x9b, 0x48, 0x64, 0x3e, 0x13, 0xfa, 0x84, 0x24, 0xdd, 0xec, 0xe7, 0xf3, 0x31, 0x9c, 0xf0, + 0x1c, 0x9f, 0xe3, 0xfb, 0xb9, 0x98, 0xcb, 0x44, 0x5f, 0x90, 0xa0, 0x0d, 0x95, 0x12, 0x1b, 0xf2, + 0xf2, 0x45, 0x16, 0x6f, 0x81, 0x3e, 0xcf, 0xc1, 0xef, 0x1c, 0x0e, 0xfc, 0x72, 0xaf, 0x94, 0x97, + 0x6f, 0xb0, 0xc0, 0xd4, 0x66, 0x05, 0xf5, 0x1e, 0x1f, 0xa1, 0x87, 0xb0, 0x80, 0x3b, 0xd8, 0x71, + 0x71, 0xc3, 0x25, 0x71, 0xea, 0x17, 0x32, 0xad, 0x60, 0x5e, 0x71, 0xfa, 0xc9, 0xef, 0xa3, 0x77, + 0x9c, 0x70, 0xcb, 0x66, 0x78, 0x47, 0x3f, 0x91, 0x2d, 0xf9, 0x8a, 0xf4, 0x89, 0x04, 0xa1, 0x26, + 0x2c, 0xf5, 0xf1, 0xfd, 0xdd, 0x75, 0x3e, 0x23, 0x3a, 0xca, 0x14, 0xe3, 0xb4, 0xc2, 0xdd, 0x4c, + 0xd2, 0x50, 0x03, 0x4e, 0xc9, 0x22, 0xbd, 0xe5, 0x04, 0x21, 0x65, 0x8e, 0x25, 0xab, 0xf5, 0xc9, + 0x4c, 0xd5, 0xfa, 0xa4, 0x80, 0x7d, 0x20, 0x59, 0xa2, 0x6a, 0x9f, 0x86, 0x49, 0xc2, 0x18, 0x65, + 0x81, 0xbe, 0xc8, 0x6f, 0x10, 0x39, 0x32, 0xae, 0xc1, 0x22, 0xbf, 0x7d, 0x6e, 0x58, 0x16, 0x6d, + 0xfb, 0x61, 0x15, 0xbb, 0xd8, 0xb7, 0x48, 0x80, 0x74, 0x98, 0xc2, 0xb6, 0xcd, 0x48, 0x10, 0xc8, + 0x2b, 0x27, 0x1e, 0x1a, 0xbf, 0x8c, 0xc3, 0xf2, 0x41, 0x2e, 0xea, 0xca, 0x6a, 0x26, 0x8a, 0x9d, + 0xb8, 0x38, 0xcf, 0x54, 0x84, 0xd0, 0x4a, 0xd4, 0x03, 0x54, 0x64, 0x0f, 0x50, 0xb9, 0x49, 0x1d, + 0xbf, 0x7a, 0x2d, 0xca, 0xe1, 0x0f, 0xbf, 0x96, 0x56, 0x47, 0x58, 0x5c, 0xe4, 0x10, 0x24, 0x2a, + 0xe1, 0xf6, 0xbe, 0xea, 0x35, 0xfe, 0xef, 0x87, 0x4a, 0x96, 0xb6, 0x66, 0xa2, 0xb4, 0x4d, 0x1c, + 0xc1, 0xaa, 0x62, 0xb8, 0x61, 0xca, 0x06, 0x48, 0xa6, 0x37, 0xee, 0x1e, 0x86, 0x6f, 0xc8, 0xde, + 0x04, 0x9c, 0x3d, 0xc0, 0x43, 0xed, 0xc7, 0x03, 0x98, 0x8b, 0x53, 0x56, 0xef, 0x60, 0xb7, 0x4d, + 0x04, 0xe0, 0x50, 0xc7, 0x37, 0x3a, 0x57, 0xf9, 0x98, 0xf2, 0x71, 0x04, 0x89, 0x5e, 0xec, 0x7e, + 0x7a, 0x24, 0x78, 0x3c, 0x13, 0x78, 0xbe, 0xcf, 0x11, 0xe8, 0x07, 0x30, 0x17, 0xa7, 0x43, 0x82, + 0x27, 0xb2, 0x29, 0x8e, 0x29, 0x02, 0x7b, 0x17, 0x66, 0xe5, 0xf5, 0xec, 0x3a, 0x9e, 0x13, 0xca, + 0x8e, 0xe5, 0xb0, 0xd0, 0x9c, 0x60, 0x6c, 0x44, 0x08, 0x64, 0xc1, 0x29, 0x51, 0x98, 0x79, 0x27, + 0x5d, 0x0f, 0xb7, 0x18, 0x09, 0xb6, 0xa8, 0x6b, 0xcb, 0xee, 0xe4, 0xb0, 0xec, 0xc5, 0x04, 0xec, + 0x7e, 0xcc, 0x32, 0xce, 0xc0, 0x12, 0xdf, 0xdf, 0x8d, 0xc4, 0x24, 0x66, 0x4d, 0x12, 0x06, 0xc6, + 0x5b, 0x50, 0x1a, 0x32, 0xa5, 0xb6, 0x5f, 0x87, 0xa9, 0x50, 0x3c, 0xe2, 0x6f, 0xe3, 0x4c, 0x2d, + 0x1e, 0x1a, 0xf3, 0x90, 0xe7, 0xce, 0x55, 0x6c, 0xdf, 0x22, 0x8d, 0x30, 0x30, 0x6a, 0xb2, 0x59, + 0x8e, 0x1f, 0x24, 0x7a, 0xe1, 0x7d, 0x8c, 0xe8, 0xec, 0xa7, 0x5a, 0x61, 0xe9, 0x24, 0x9b, 0x61, + 0x15, 0xa4, 0x0a, 0x0b, 0xb2, 0xbd, 0xed, 0xaa, 0xca, 0x3a, 0xf4, 0x2c, 0xf7, 0x7b, 0xe4, 0xf1, + 0x64, 0x8f, 0xfc, 0xa7, 0x06, 0xfa, 0x20, 0x44, 0x69, 0x23, 0x30, 0x25, 0x2e, 0x9c, 0xe0, 0x28, + 0xaa, 0x4d, 0xcc, 0x46, 0x16, 0x4c, 0x86, 0x22, 0xca, 0x11, 0x14, 0x1a, 0x89, 0x36, 0xde, 0x85, + 0xb9, 0x78, 0x9d, 0xf2, 0x8e, 0x3b, 0x6c, 0xaa, 0x9e, 0xc2, 0xe9, 0xfd, 0x04, 0x95, 0xa7, 0xfe, + 0x02, 0xb4, 0x23, 0x5b, 0xc0, 0xf5, 0xbf, 0x66, 0xe0, 0x38, 0x8f, 0x8f, 0x5a, 0x30, 0x29, 0x3e, + 0xc8, 0xd0, 0xb9, 0xf4, 0x59, 0x49, 0x7c, 0xe1, 0x15, 0x56, 0x5e, 0x39, 0x1d, 0xcb, 0x37, 0xca, + 0x9f, 0xff, 0xf8, 0xc7, 0x37, 0xe3, 0x05, 0xa4, 0x9b, 0xa9, 0xcf, 0x50, 0xf1, 0xa9, 0x87, 0xbe, + 0xd3, 0x60, 0x61, 0xf0, 0x6b, 0x0e, 0x5d, 0x1e, 0x42, 0x1f, 0x34, 0x2c, 0x98, 0x23, 0x1a, 0x2a, + 0x41, 0xff, 0xe1, 0x82, 0x56, 0xd0, 0x85, 0xb4, 0x20, 0xa6, 0x7c, 0xea, 0x22, 0x2f, 0xe8, 0x4b, + 0x0d, 0xf2, 0xfb, 0xbf, 0x06, 0x2f, 0x0e, 0x89, 0xb7, 0xcf, 0xaa, 0xf0, 0xdf, 0x51, 0xac, 0x94, + 0xa4, 0x55, 0x2e, 0xc9, 0x40, 0xe5, 0xb4, 0x24, 0x8f, 0x3b, 0xd4, 0x03, 0x19, 0xfd, 0x5b, 0x0d, + 0xe6, 0x07, 0xaf, 0xfc, 0x4b, 0x43, 0x62, 0x0d, 0xd8, 0x15, 0x2a, 0xa3, 0xd9, 0x29, 0x55, 0x57, + 0xb9, 0xaa, 0x8b, 0xc8, 0x48, 0xab, 0xc2, 0xc2, 0xa5, 0xde, 0x88, 0x35, 0x7c, 0xad, 0xc1, 0xdc, + 0xc0, 0xc5, 0xb7, 0xf2, 0xea, 0x70, 0x71, 0xa6, 0xd6, 0x46, 0x32, 0x53, 0xa2, 0xae, 0x70, 0x51, + 0x17, 0xd0, 0xf9, 0xe1, 0xa2, 0xe2, 0x5c, 0x7d, 0xaf, 0x01, 0x4a, 0xd7, 0x57, 0x74, 0x65, 0x48, + 0xc0, 0xb4, 0x69, 0x61, 0x7d, 0x64, 0x53, 0xa5, 0x6f, 0x8d, 0xeb, 0xbb, 0x8c, 0x56, 0xd2, 0xfa, + 0xf6, 0x5d, 0x38, 0x52, 0x4c, 0x0f, 0xa6, 0xe3, 0xa2, 0x8d, 0x4a, 0x43, 0xa2, 0xc5, 0x06, 0x85, + 0xcb, 0xaf, 0x31, 0x50, 0x22, 0x2e, 0x70, 0x11, 0xe7, 0xd0, 0xd9, 0xb4, 0x88, 0x06, 0xb6, 0xeb, + 0x36, 0x0f, 0xf7, 0x85, 0x06, 0xb9, 0x64, 0x71, 0x37, 0x86, 0x1e, 0x59, 0x65, 0x53, 0xb8, 0xfa, + 0x7a, 0x1b, 0x25, 0xe2, 0x12, 0x17, 0x51, 0x46, 0xc5, 0x83, 0x0e, 0x75, 0x57, 0xf5, 0xfd, 0xe8, + 0x29, 0xcc, 0xf4, 0xcb, 0x66, 0x79, 0x78, 0x00, 0x61, 0x51, 0x58, 0x7d, 0x9d, 0x85, 0x12, 0x70, + 0x91, 0x0b, 0x28, 0xa2, 0xe5, 0x83, 0x05, 0x88, 0x76, 0xa0, 0x7a, 0x67, 0xf7, 0xf7, 0xe2, 0xd8, + 0xee, 0xf3, 0xa2, 0xf6, 0xec, 0x79, 0x51, 0xfb, 0xed, 0x79, 0x51, 0xfb, 0xea, 0x45, 0x71, 0xec, + 0xd9, 0x8b, 0xe2, 0xd8, 0x4f, 0x2f, 0x8a, 0x63, 0x8f, 0xae, 0x25, 0x2a, 0x69, 0x44, 0x59, 0xf3, + 0x49, 0xb8, 0x43, 0xd9, 0xb6, 0x40, 0x76, 0xfe, 0x6f, 0x76, 0xfb, 0x5c, 0x5e, 0x57, 0x1b, 0x93, + 0xfc, 0xbf, 0x63, 0xff, 0xfb, 0x27, 0x00, 0x00, 0xff, 0xff, 0x2b, 0xa0, 0xd2, 0xea, 0xe4, 0x13, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1450,6 +1452,15 @@ func (m *QueryMarketSummaryResponse) MarshalToSizedBuffer(dAtA []byte) (int, err _ = i var l int _ = l + if len(m.Errors) > 0 { + i -= len(m.Errors) + copy(dAtA[i:], m.Errors) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Errors))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xa2 + } if m.OracleHistoricPrice != nil { { size := m.OracleHistoricPrice.Size() @@ -2241,6 +2252,10 @@ func (m *QueryMarketSummaryResponse) Size() (n int) { l = m.OracleHistoricPrice.Size() n += 2 + l + sovQuery(uint64(l)) } + l = len(m.Errors) + if l > 0 { + n += 2 + l + sovQuery(uint64(l)) + } return n } @@ -3451,6 +3466,38 @@ func (m *QueryMarketSummaryResponse) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 20: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Errors", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + 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 ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Errors = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) From f71305b0ecbc7217f1a8b3599c351926949e9d19 Mon Sep 17 00:00:00 2001 From: toteki <63419657+toteki@users.noreply.github.com> Date: Thu, 9 Feb 2023 13:12:16 -0700 Subject: [PATCH 5/7] err++ --- x/leverage/keeper/grpc_query.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/x/leverage/keeper/grpc_query.go b/x/leverage/keeper/grpc_query.go index f427eeda7e..93e80a7e13 100644 --- a/x/leverage/keeper/grpc_query.go +++ b/x/leverage/keeper/grpc_query.go @@ -2,7 +2,6 @@ package keeper import ( "context" - "fmt" sdk "github.com/cosmos/cosmos-sdk/types" "google.golang.org/grpc/codes" @@ -139,11 +138,11 @@ func (q Querier) MarketSummary( if oraclePrice, _, oracleErr := q.Keeper.TokenPrice(ctx, req.Denom, types.PriceModeSpot); oracleErr == nil { resp.OraclePrice = &oraclePrice } - historicPrice, historicN, historicErr := q.Keeper.TokenPrice(ctx, req.Denom, types.PriceModeHistoric) + historicPrice, _, historicErr := q.Keeper.TokenPrice(ctx, req.Denom, types.PriceModeHistoric) if historicErr == nil { resp.OracleHistoricPrice = &historicPrice } else { - resp.Errors += fmt.Sprintf("\nhistoric N \n %d, error \n %s", historicN, historicErr) + resp.Errors += historicErr.Error() } return &resp, nil From ba88e99bfab35b1483c48e54fee6c67f4c2b1eaf Mon Sep 17 00:00:00 2001 From: toteki <63419657+toteki@users.noreply.github.com> Date: Thu, 9 Feb 2023 13:26:56 -0700 Subject: [PATCH 6/7] err++ --- x/leverage/keeper/grpc_query.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x/leverage/keeper/grpc_query.go b/x/leverage/keeper/grpc_query.go index 93e80a7e13..e3c9ae7936 100644 --- a/x/leverage/keeper/grpc_query.go +++ b/x/leverage/keeper/grpc_query.go @@ -135,8 +135,11 @@ func (q Querier) MarketSummary( } // Oracle prices in response will be nil if it is unavailable - if oraclePrice, _, oracleErr := q.Keeper.TokenPrice(ctx, req.Denom, types.PriceModeSpot); oracleErr == nil { + oraclePrice, _, oracleErr := q.Keeper.TokenPrice(ctx, req.Denom, types.PriceModeSpot) + if oracleErr == nil { resp.OraclePrice = &oraclePrice + } else { + resp.Errors += oracleErr.Error() } historicPrice, _, historicErr := q.Keeper.TokenPrice(ctx, req.Denom, types.PriceModeHistoric) if historicErr == nil { From a6aabadce85894323979ce28ce077caeb0f804b4 Mon Sep 17 00:00:00 2001 From: Adam Moser <63419657+toteki@users.noreply.github.com> Date: Thu, 9 Feb 2023 13:42:05 -0700 Subject: [PATCH 7/7] clean diff --- go.mod | 1 - 1 file changed, 1 deletion(-) diff --git a/go.mod b/go.mod index 85c0afb05d..75ba4a9fa3 100644 --- a/go.mod +++ b/go.mod @@ -267,7 +267,6 @@ require ( github.com/sivchari/nosnakecase v1.7.0 // indirect github.com/sivchari/tenv v1.7.1 // indirect github.com/sonatard/noctx v0.0.1 // indirect - github.com/sourcegraph/go-diff v0.6.1 // indirect github.com/sourcegraph/go-diff v0.7.0 // indirect github.com/spf13/afero v1.9.3 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect