From dcb5fcbe37ffc6fff93b84742dec16cda1788f2a Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Fri, 28 Oct 2022 10:49:58 -0600 Subject: [PATCH 01/24] Refactor to use packet metadata instead of overloaded receiver --- go.mod | 85 +-- go.sum | 861 +++++--------------------- router/keeper/keeper.go | 67 +- router/module.go | 21 +- router/parser/receiver_parser.go | 88 --- router/parser/receiver_parser_test.go | 123 ---- 6 files changed, 216 insertions(+), 1029 deletions(-) delete mode 100644 router/parser/receiver_parser.go delete mode 100644 router/parser/receiver_parser_test.go diff --git a/go.mod b/go.mod index 723b0e6..9f51284 100644 --- a/go.mod +++ b/go.mod @@ -1,24 +1,24 @@ -go 1.17 +go 1.19 module github.com/strangelove-ventures/packet-forward-middleware/v3 replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 require ( - github.com/armon/go-metrics v0.3.10 - github.com/cosmos/cosmos-sdk v0.45.1 - github.com/cosmos/ibc-go/v3 v3.0.0 + github.com/armon/go-metrics v0.4.0 + github.com/cosmos/cosmos-sdk v0.45.10 + github.com/cosmos/ibc-go/v3 v3.0.0-rc2.0.20221027123302-68845e541902 github.com/gogo/protobuf v1.3.3 github.com/golang/mock v1.6.0 github.com/golang/protobuf v1.5.2 github.com/gorilla/mux v1.8.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 - github.com/spf13/cobra v1.3.0 - github.com/stretchr/testify v1.7.0 - github.com/tendermint/tendermint v0.34.14 - github.com/tendermint/tm-db v0.6.4 - google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa - google.golang.org/grpc v1.44.0 + github.com/spf13/cobra v1.5.0 + github.com/stretchr/testify v1.8.0 + github.com/tendermint/tendermint v0.34.22 + github.com/tendermint/tm-db v0.6.6 + google.golang.org/genproto v0.0.0-20220725144611-272f38e5d71b + google.golang.org/grpc v1.50.0 ) require ( @@ -28,13 +28,13 @@ require ( github.com/DataDog/zstd v1.4.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect - github.com/btcsuite/btcd v0.22.0-beta // indirect + github.com/btcsuite/btcd v0.22.1 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/confio/ics23/go v0.7.0 // indirect github.com/cosmos/btcutil v1.0.4 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect - github.com/cosmos/iavl v0.17.3 // indirect + github.com/cosmos/iavl v0.19.3 // indirect github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect github.com/cosmos/ledger-go v0.9.2 // indirect github.com/danieljoos/wincred v1.0.2 // indirect @@ -44,14 +44,15 @@ require ( github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect github.com/dustin/go-humanize v1.0.0 // indirect github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b // indirect - github.com/fsnotify/fsnotify v1.5.1 // indirect - github.com/go-kit/kit v0.10.0 // indirect - github.com/go-logfmt/logfmt v0.5.0 // indirect + github.com/fsnotify/fsnotify v1.5.4 // indirect + github.com/go-kit/kit v0.12.0 // indirect + github.com/go-kit/log v0.2.1 // indirect + github.com/go-logfmt/logfmt v0.5.1 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/golang/snappy v0.0.3 // indirect github.com/google/btree v1.0.0 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/gorilla/websocket v1.4.2 // indirect + github.com/gorilla/websocket v1.5.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/gtank/merlin v0.1.1 // indirect @@ -60,48 +61,50 @@ require ( github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/inconshreveable/mousetrap v1.0.1 // indirect github.com/jmhodges/levigo v1.0.0 // indirect github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d // indirect - github.com/libp2p/go-buffer-pool v0.0.2 // indirect - github.com/magiconair/properties v1.8.5 // indirect - github.com/mattn/go-isatty v0.0.14 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect - github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 // indirect + github.com/libp2p/go-buffer-pool v0.1.0 // indirect + github.com/magiconair/properties v1.8.6 // indirect + github.com/mattn/go-isatty v0.0.16 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect - github.com/mitchellh/mapstructure v1.4.3 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mtibben/percent v0.2.1 // indirect - github.com/pelletier/go-toml v1.9.4 // indirect + github.com/pelletier/go-toml v1.9.5 // indirect + github.com/pelletier/go-toml/v2 v2.0.5 // indirect github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.11.0 // indirect + github.com/prometheus/client_golang v1.12.2 // indirect github.com/prometheus/client_model v0.2.0 // indirect - github.com/prometheus/common v0.29.0 // indirect - github.com/prometheus/procfs v0.6.0 // indirect - github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect + github.com/prometheus/common v0.34.0 // indirect + github.com/prometheus/procfs v0.7.3 // indirect + github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/regen-network/cosmos-proto v0.3.1 // indirect - github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect - github.com/spf13/afero v1.6.0 // indirect - github.com/spf13/cast v1.4.1 // indirect + github.com/sasha-s/go-deadlock v0.3.1 // indirect + github.com/spf13/afero v1.8.2 // indirect + github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/spf13/viper v1.10.1 // indirect - github.com/subosito/gotenv v1.2.0 // indirect + github.com/spf13/viper v1.13.0 // indirect + github.com/subosito/gotenv v1.4.1 // indirect github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca // indirect github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect github.com/tendermint/btcd v0.1.1 // indirect github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/zondax/hid v0.9.0 // indirect - go.etcd.io/bbolt v1.3.5 // indirect - golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect - golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f // indirect - golang.org/x/sys v0.0.0-20211210111614-af8b64212486 // indirect - golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect + go.etcd.io/bbolt v1.3.6 // indirect + golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect + golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect + golang.org/x/net v0.0.0-20220812174116-3211cb980234 // indirect + golang.org/x/sys v0.0.0-20220818161305-2296e01440c6 // indirect + golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect golang.org/x/text v0.3.7 // indirect - google.golang.org/protobuf v1.27.1 // indirect - gopkg.in/ini.v1 v1.66.2 // indirect + google.golang.org/protobuf v1.28.1 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index b088e21..04ceb11 100644 --- a/go.sum +++ b/go.sum @@ -3,6 +3,7 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= @@ -15,18 +16,7 @@ cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOY cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= -cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= -cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= -cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= -cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= -cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= -cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= -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.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= 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= @@ -35,8 +25,6 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= 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.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= 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= @@ -46,26 +34,12 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= 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= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.0.0-beta.2 h1:/BZRNzm8N4K4eWfK28dL4yescorxtO7YG1yun8fy+pI= filippo.io/edwards25519 v1.0.0-beta.2/go.mod h1:X+pm78QAUPtFLi1z9PYIlS/bdDnvbCOGKtZ+ACWEf7o= github.com/99designs/keyring v1.1.6 h1:kVDC2uCgVwecxCk+9zoCt2uEL6dt+dfVzMvGgnVcIuM= github.com/99designs/keyring v1.1.6/go.mod h1:16e0ds7LGQQcT59QqkTg72Hh5ShM51Byv5PEmW6uoRU= -github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= -github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc= -github.com/Azure/azure-storage-blob-go v0.7.0/go.mod h1:f9YQKtsG1nMisotuTPpO0tjNuEjKRYAcJU8/ydDI++4= -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= -github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= -github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= -github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= -github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= -github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= -github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= -github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= -github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= @@ -74,265 +48,146 @@ github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3 github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= -github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= -github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= -github.com/VictoriaMetrics/fastcache v1.5.7/go.mod h1:ptDBkNMQI4RtmVo8VS/XwRY6RoTu1dAWCbrk+6WsEM8= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= -github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/Workiva/go-datastructures v1.0.52 h1:PLSK6pwn8mYdaoaCZEMsXBpBotr4HHn9abU0yMQt0NI= -github.com/Workiva/go-datastructures v1.0.52/go.mod h1:Z+F2Rca0qCsVYDS8z7bAGm8f3UkzuWYS/oBZz5a7VVA= -github.com/Zilliqa/gozilliqa-sdk v1.2.1-0.20201201074141-dd0ecada1be6/go.mod h1:eSYp2T6f0apnuW8TzhV3f6Aff2SE8Dwio++U4ha4yEM= -github.com/adlio/schema v1.1.13/go.mod h1:L5Z7tw+7lRK1Fnpi/LT/ooCP1elkXn0krMWBQHUhEDE= +github.com/Workiva/go-datastructures v1.0.53 h1:J6Y/52yX10Xc5JjXmGtWoSSxs3mZnGSaq37xZZh7Yig= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= -github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= -github.com/armon/go-metrics v0.3.10 h1:FR+drcQStOe+32sYyJYyZ7FIdgoGGBnwLl+flodp8Uo= -github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= -github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-sdk-go v1.25.48/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= +github.com/armon/go-metrics v0.4.0 h1:yCQqn7dwca4ITXb+CbubHmedzaQYHhNhrEXLYUeEe8Q= +github.com/armon/go-metrics v0.4.0/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= 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/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= -github.com/btcsuite/btcd v0.0.0-20171128150713-2e60448ffcc6/go.mod h1:Dmm/EzmjnCiweXmzRIAiUWCInVmPgjkzgv5k4tVyXiQ= github.com/btcsuite/btcd v0.0.0-20190115013929-ed77733ec07d/go.mod h1:d3C0AkH6BRcvO8T0UEPu53cnw4IbV63x1bEjildYhO0= -github.com/btcsuite/btcd v0.0.0-20190315201642-aa6e0f35703c/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= -github.com/btcsuite/btcd v0.21.0-beta/go.mod h1:ZSWyehm27aAuS9bvkATT+Xte3hjHZ+MRgMY/8NJ7K94= -github.com/btcsuite/btcd v0.22.0-beta h1:LTDpDKUM5EeOFBPM8IXpinEcmZ6FWfNZbE3lfrfdnWo= -github.com/btcsuite/btcd v0.22.0-beta/go.mod h1:9n5ntfhhHQBIhUvlhDvD3Qg6fRUj4jkN0VB8L8svzOA= +github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= +github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= +github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20180706230648-ab6388e0c60a/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= -github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= -github.com/btcsuite/btcutil v1.0.2/go.mod h1:j9HUFwoQRsZL3V4n+qG+CUnEGHOarIxfC3Le2Yhbcts= github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ= -github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o= github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg= github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY= -github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I= github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= -github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= -github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= -github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= -github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudflare/cloudflare-go v0.10.2-0.20190916151808-a80f83b9add9/go.mod h1:1MxXX1Ux4x6mqPmjkUgTP1CdXIBXKX7T+Jk9Gxrmx+U= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/coinbase/rosetta-sdk-go v0.7.0 h1:lmTO/JEpCvZgpbkOITL95rA80CPKb5CtMzLaqF2mCNg= -github.com/coinbase/rosetta-sdk-go v0.7.0/go.mod h1:7nD3oBPIiHqhRprqvMgPoGxe/nyq3yftRmpsy29coWE= -github.com/confio/ics23/go v0.6.6/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= github.com/confio/ics23/go v0.7.0 h1:00d2kukk7sPoHWL4zZBZwzxnpA2pec1NPdwbSokJ5w8= github.com/confio/ics23/go v0.7.0/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= -github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ= -github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/btcutil v1.0.4 h1:n7C2ngKXo7UC9gNyMNLbzqz7Asuf+7Qv4gnX/rOdQ44= github.com/cosmos/btcutil v1.0.4/go.mod h1:Ffqc8Hn6TJUdDgHBwIZLtrLQC1KdJ9jGJl/TvgUaxbU= -github.com/cosmos/cosmos-sdk v0.45.1 h1:PY79YxPea5qlRLExRnzg8/rT1Scc8GGgRs22p7DX99Q= -github.com/cosmos/cosmos-sdk v0.45.1/go.mod h1:XXS/asyCqWNWkx2rW6pSuen+EVcpAFxq6khrhnZgHaQ= +github.com/cosmos/cosmos-sdk v0.45.10 h1:YRf1N6C7OFCc8FJ5wuhcnDDySJNDn5DxSscVgbeXgz4= +github.com/cosmos/cosmos-sdk v0.45.10/go.mod h1:CbfWNs4PuxxsvRD/snQuSBDwIhtsD7rIDTVQyYMKTa0= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= -github.com/cosmos/iavl v0.17.3 h1:s2N819a2olOmiauVa0WAhoIJq9EhSXE9HDBAoR9k+8Y= -github.com/cosmos/iavl v0.17.3/go.mod h1:prJoErZFABYZGDHka1R6Oay4z9PrNeFFiMKHDAMOi4w= -github.com/cosmos/ibc-go/v3 v3.0.0 h1:XUNplHVS51Q2gMnTFsFsH9QJ7flsovMamnltKbEgPQ4= -github.com/cosmos/ibc-go/v3 v3.0.0/go.mod h1:Mb+1NXiPOLd+CPFlOC6BKeAUaxXlhuWenMmRiUiSmwY= +github.com/cosmos/iavl v0.19.3 h1:cESO0OwTTxQm5rmyESKW+zESheDUYI7CcZDWWDwnuxg= +github.com/cosmos/iavl v0.19.3/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= +github.com/cosmos/ibc-go/v3 v3.0.0-rc2.0.20221027123302-68845e541902 h1:k6Uoi9bIX2SOjr3JG7WjNzy/QjL6WOuEfRe0rq7ARm4= +github.com/cosmos/ibc-go/v3 v3.0.0-rc2.0.20221027123302-68845e541902/go.mod h1:VUWLHw0C3USmTQZnTdkuXXdUdLbW8zsK3lV1Ieposog= +github.com/cosmos/ibc-go/v3 v3.3.1 h1:i8o3iPSPN8fr7AjCPQnHEKz/VfeMrxc8mjvgAw6txWk= +github.com/cosmos/ibc-go/v3 v3.3.1/go.mod h1:V1nliDk/5q5KWr0mup7M76oN4SY0IOU371SKbCV2wN0= github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4= github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY= github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI= github.com/cosmos/ledger-go v0.9.2/go.mod h1:oZJ2hHAZROdlHiwTg4t7kP+GKIIkBT+o6c9QWFanOyI= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/creachadair/taskgroup v0.3.2 h1:zlfutDS+5XG40AOxcHDSThxKzns8Tnr9jnr6VqkYlkM= github.com/danieljoos/wincred v1.0.2 h1:zf4bhty2iLuwgjgpraD2E9UbvO+fe54XXGJbOwe23fU= github.com/danieljoos/wincred v1.0.2/go.mod h1:SnuYRW9lp1oJrZX/dXJqr0cPK5gYXqx3EJbmjhLdK9U= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= -github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= -github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= github.com/dgraph-io/badger/v2 v2.2007.2 h1:EjjK0KqwaFMlPin1ajhP943VPENHJdEz1KLIegjaI3k= github.com/dgraph-io/badger/v2 v2.2007.2/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE= github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= github.com/dgraph-io/ristretto v0.0.3 h1:jh22xisGBjrEVnRZ1DVTpBVQm0Xndu8sMl0CWDzSIBI= github.com/dgraph-io/ristretto v0.0.3/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= -github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= -github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= -github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= -github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/dop251/goja v0.0.0-20200721192441-a695b0cdd498/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA= -github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b h1:HBah4D48ypg3J7Np4N+HY/ZR76fx3HEUGxDU6Uk39oQ= github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b/go.mod h1:7BvyPhdbLxMXIYTFPLsyJRFMsKmOZnQmzh6Gb+uquuM= -github.com/dvyukov/go-fuzz v0.0.0-20200318091601-be3528f3a813/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= -github.com/ethereum/go-ethereum v1.9.25/go.mod h1:vMkFiYLHI4tgPw4k2j4MHKoovchFE8plZ0M9VMk4/oM= -github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ= -github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= +github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= -github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= -github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 h1:E2s37DuLxFhQDg5gKsWoLBOB0n+ZW8s599zru8FJ2/Y= -github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= -github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= -github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk= github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= -github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= -github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= -github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= -github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= -github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= +github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= -github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= -github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= +github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= +github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= -github.com/gin-gonic/gin v1.7.0/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY= 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/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= -github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= +github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4= +github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEaizzs= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= +github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= +github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= -github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= -github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= -github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= -github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= -github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= -github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= +github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= -github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= -github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= -github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= -github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/gateway v1.1.0 h1:u0SuhL9+Il+UbjM9VIE3ntfRujKbvVpFvNB4HbjeVQ0= -github.com/gogo/gateway v1.1.0/go.mod h1:S7rR8FRQyG3QFESeSv4l2WnsyzlCLG0CzBbUUo/mbic= -github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= 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/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -340,7 +195,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -359,12 +213,9 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -378,22 +229,17 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/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= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/orderedcode v0.0.1 h1:UzfcAexk9Vhv8+9pNOgRu41f16lHq725vPwnSeiG/Us= -github.com/google/orderedcode v0.0.1/go.mod h1:iVyU4/qPKHY5h/wSd6rZZCDcLJNxiWO6dvsYES2Sb20= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -403,44 +249,19 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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= -github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= -github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.1-0.20190629185528-ae1634f6a989/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY= -github.com/graph-gophers/graphql-go v0.0.0-20191115155744-f33e81362277/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -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/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/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= @@ -450,405 +271,199 @@ github.com/gtank/merlin v0.1.1 h1:eQ90iG7K9pOhtereWsmyRJ6RAwcP4tHTDBHXNg+u5is= github.com/gtank/merlin v0.1.1/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= github.com/gtank/ristretto255 v0.1.2 h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uMzcc= github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIvY4OmlYW69o= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= -github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= -github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0 h1:RS8zrF7PhGwyNPOtxSClXXj9HA8feRnJzgnI1RJCSnM= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -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/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= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= -github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= -github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87 h1:uUjLpLt6bVvZ72SQc/B4dXcPBw4Vgd7soowdRl52qEM= github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87/go.mod h1:XGsKKeXxeRr95aEOgipvluMPlgjr7dGlk9ZTWOjcUcg= -github.com/holiman/uint256 v1.1.1/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= 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/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc= -github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/improbable-eng/grpc-web v0.14.1 h1:NrN4PY71A6tAz2sKDvC5JCauENWp0ykG8Oq1H3cpFvw= -github.com/improbable-eng/grpc-web v0.14.1/go.mod h1:zEjGHa8DAlkoOXmswrNvhUGEYQA9UI7DhrGeHR1DMGU= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= -github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= -github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU= +github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= +github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jhump/protoreflect v1.9.0/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U= github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ= -github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/julienschmidt/httprouter v1.1.1-0.20170430222011-975b5c4c7c21/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d h1:Z+RDyXzjKE0i2sTjZ/b1uxiGtPhFy34Ou/Tk0qwN0kM= github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d/go.mod h1:JJNrCn9otv/2QP4D7SMJBgaleKpOf66PnW6F5WGNRIc= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= -github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.11.7 h1:0hzRabrMN4tSTvMfnL3SCv1ZGeAP23ynzodBgaHeMeg= -github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= 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/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= -github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8= -github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/libp2p/go-buffer-pool v0.0.2 h1:QNK2iAFa8gjAe1SPz6mHSMuCcjs+X1wlHzeOSqcmlfs= -github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM= -github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= -github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= -github.com/lucasjones/reggen v0.0.0-20180717132126-cdb49ff09d77/go.mod h1:5ELEyG+X8f+meRWHuqUOewBOhvHkl7M76pdGEansxW4= -github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= -github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= +github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs= +github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= +github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= -github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= -github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= -github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.5-0.20180830101745-3fb116b82035/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= -github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= +github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= +github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= -github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= -github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 h1:hLDRPB66XQT/8+wG9WsDpiCvZf1yKO7sz7scAjSlBa0= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= -github.com/minio/highwayhash v1.0.1 h1:dZ6IIu8Z14VlC0VpfKofAhCy74wu/Qb5gcn52yWoz/0= -github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94= +github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= +github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= -github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/grpc-proxy v0.0.0-20181017164139-0f1106ef9c76/go.mod h1:x5OoJHDHqxHS801UIuhqGl6QdSAEJvtausosHSdazIo= -github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= -github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= -github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= -github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= -github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= -github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= -github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/neilotoole/errgroup v0.1.5/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nishanths/predeclared v0.0.0-20200524104333-86fad755b4d3/go.mod h1:nt3d53pc1VYcphSCIaYAJtnPYnr3Zyn8fMq2wvPGPso= +github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= -github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +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/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= -github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= -github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak= -github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= -github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= -github.com/opencontainers/runc v1.0.3/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= -github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= -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/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= -github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= github.com/otiai10/copy v1.6.0 h1:IinKAryFFuPONZ7cm6T6E2QX/vcJwSnlaA5lfoaXIiQ= -github.com/otiai10/copy v1.6.0/go.mod h1:XWfuS3CrI0R6IE0FbgHsEazaXO8G0LpMp9o8tos0x4E= -github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= -github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= -github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= -github.com/otiai10/mint v1.3.2/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= -github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= -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.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= -github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= -github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= +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/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= -github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= -github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= -github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= -github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.8.0/go.mod h1:O9VU6huf47PktckDQfMTX0Y8tY0/7TSWwj+ITvv0TnM= -github.com/prometheus/client_golang v1.11.0 h1:HNkLOAEQMIDv/K+04rukrLx6ch7msSRwf3/SASFAGtQ= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.12.2 h1:51L9cDoUHVrXx4zWYlcLQIZ+d+VXHgqnYKkIuq4g/34= +github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= 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= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.14.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.29.0 h1:3jqPBvKT4OHAbje2Ql7KeaaSicDBCxMYwEJU1zRJceE= -github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.34.0 h1:RBmGO9d/FVjqHT0yUGQwBJhkwKV+wPCn7KGpvfab0uE= +github.com/prometheus/common v0.34.0/go.mod h1:gB3sOl7P0TvJabZpLY5uQMpUqRCPPCyRLCZYc7JZTNE= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/tsdb v0.6.2-0.20190402121629-4f204dcbc150/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= +github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= -github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 h1:MkV+77GLUNo5oJ0jf870itWm3D0Sjh7+Za9gazKc5LQ= -github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/regen-network/cosmos-proto v0.3.1 h1:rV7iM4SSFAagvy8RiyhiACbWEGotmqzywPxOvwMdxcg= github.com/regen-network/cosmos-proto v0.3.1/go.mod h1:jO0sVX6a1B36nmE8C9xBFXpNwWejXC7QqCOnH3O0+YM= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= github.com/regen-network/protobuf v1.3.3-alpha.regen.1/go.mod h1:2DjTFR1HhMQhiWC5sZ4OhQ3+NtdbZ6oBDKQwq5Ou+FI= -github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rs/cors v0.0.0-20160617231935-a62a804a8a00/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= -github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521/go.mod h1:RvLn4FgxWubrpZHtQLnOf6EwhN2hEMusxZOhcW9H3UQ= -github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= -github.com/rs/zerolog v1.23.0 h1:UskrK+saS9P9Y789yNNulYKdARjPZuS35B8gJF2x60g= -github.com/rs/zerolog v1.23.0/go.mod h1:6c7hFfxPOy7TacJc4Fcdi24/J0NKYGzjG8FWRI916Qo= +github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= +github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= +github.com/rs/zerolog v1.27.0 h1:1T7qCieN22GVc8S4Q2yuexzBb1EqjbgjSH9RohbMjKs= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= -github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM= -github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= -github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa h1:0U2s5loxrTy6/VgfVoLuVLFJcURKLH49ie0zSch7gh4= -github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= -github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= -github.com/shirou/gopsutil v2.20.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= +github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa/go.mod h1:oJyF+mSPHbB5mVY2iO9KV3pTt/QbIkGaO8gQ2WrDbP4= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= 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.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= -github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= -github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= +github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= -github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= +github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= -github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= -github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0= -github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= +github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= +github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= -github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= 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.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= -github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= -github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk= -github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= -github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= -github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570/go.mod h1:8OR4w3TdeIHIh1g6EMY5p0gVNOovcWC+1vpc7naMuAw= -github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3/go.mod h1:hpGUWaI9xL8pRQCTXQgocU38Qw1g0Us7n5PxxTwTCYU= -github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= +github.com/spf13/viper v1.13.0 h1:BWSJ/M+f+3nmdz9bxB+bWX28kkALN2ok11D0rSo8EJU= +github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+zgdYw= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= 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/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= -github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= +github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca h1:Ld/zXl5t4+D69SiV4JoN7kkfvJdOWlPpfxrzxpLMoUk= github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca/go.mod h1:u2MKkTVTVJWe5D1rCvame8WqhBd88EuIwODJZ1VHCPM= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok= @@ -859,32 +474,13 @@ github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 h1:hqAk8riJvK4RM github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15/go.mod h1:z4YtwM70uOnk8h0pjJYlj3zdYwi9l03By6iAIF5j/Pk= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= -github.com/tendermint/tendermint v0.34.14 h1:GCXmlS8Bqd2Ix3TQCpwYLUNHe+Y+QyJsm5YE+S/FkPo= -github.com/tendermint/tendermint v0.34.14/go.mod h1:FrwVm3TvsVicI9Z7FlucHV6Znfd5KBc/Lpp69cCwtk0= -github.com/tendermint/tm-db v0.6.4 h1:3N2jlnYQkXNQclQwd/eKV/NzlqPlfK21cpRRIx80XXQ= -github.com/tendermint/tm-db v0.6.4/go.mod h1:dptYhIpJ2M5kUuenLr+Yyf3zQOv1SgBZcl8/BmWlMBw= -github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI= -github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= -github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/tidwall/sjson v1.1.4/go.mod h1:wXpKXu8CtDjKAZ+3DrKY5ROCorDFahq8l0tey/Lx1fg= -github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tendermint/tendermint v0.34.22 h1:XMhtC8s8QqJO4l/dn+TkQvevTRSow3Vixjclr41o+2Q= +github.com/tendermint/tendermint v0.34.22/go.mod h1:YpP5vBEAKUT4g6oyfjKgFeZmdB/GjkJAxfF+cgmJg6Y= +github.com/tendermint/tm-db v0.6.6 h1:EzhaOfR0bdKyATqcd5PNeyeq8r+V4bRPHBfyFdD9kGM= +github.com/tendermint/tm-db v0.6.6/go.mod h1:wP8d49A85B7/erz/r4YbKssKw6ylsO/hKtFk7E1aWZI= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= -github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= -github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= -github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= -github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= -github.com/vmihailenco/msgpack/v5 v5.1.4/go.mod h1:C5gboKD0TJPqWDTVTtrQNfRbiBwHZGo8UTqP/9/XvLI= -github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= -github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208/go.mod h1:IotVbo4F+mw0EzQ08zFqg7pK3FebNXpaMsRy2RT+Ees= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -github.com/ybbus/jsonrpc v2.1.2+incompatible/go.mod h1:XJrh1eMSzdIYFbM08flv0wp5G35eRniyeGut1z+LSiE= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -892,64 +488,37 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/zondax/hid v0.9.0 h1:eiT3P6vNxAEVxXMw66eZUAAnU2zD33JBkfG/EnfAKl8= github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= -go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= -go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= -go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= -go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= +go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= 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/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -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= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= 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.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190909091759-094676da4a83/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/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/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= 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-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= 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= @@ -957,7 +526,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= +golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA= +golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -971,32 +541,22 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mobile v0.0.0-20200801112145-973feb4309de/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= 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.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -1007,8 +567,6 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -1016,7 +574,6 @@ golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= @@ -1026,23 +583,17 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= -golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f h1:w6wWR0H+nyVpbSAQbzVEIACVyr/h8l/BEkY6Sokc7Eg= -golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E= +golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1052,15 +603,8 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= 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= @@ -1072,54 +616,37 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/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= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1129,69 +656,49 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/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/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210903071746-97244b99971b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211210111614-af8b64212486 h1:5hpz5aRr+W1erYCL5JRhSUBJRph7l9XkNveoExlrKYk= -golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220818161305-2296e01440c6 h1:Sx/u41w+OwrInGdEckYmEuU5gHoGSL4QbDz3S9s6j4U= +golang.org/x/sys v0.0.0-20220818161305-2296e01440c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc= +golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= 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= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -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= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -1199,12 +706,8 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1212,8 +715,6 @@ golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -1228,10 +729,8 @@ golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWc golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= @@ -1239,21 +738,16 @@ golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82u golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= +golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df h1:5Pf6pFKu98ODmgnpvkJ3kFUOQGGLIzLIkbzUHp47618= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -1273,23 +767,7 @@ 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.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= -google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= -google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= -google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= -google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= -google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= -google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= -google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= -google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= -google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw= -google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= 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= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= @@ -1302,7 +780,6 @@ google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRn google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= @@ -1332,50 +809,17 @@ google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201119123407-9b1e624d6bc4/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/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-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -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-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= -google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= -google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= -google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa h1:I0YcKz0I7OAhddo7ya8kMnvprhcWM045PmkBdMO9zN0= -google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/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-20220725144611-272f38e5d71b h1:SfSkJugek6xm7lWywqth4r2iTrYLpD8lOj1nMIIhMNM= +google.golang.org/genproto v0.0.0-20220725144611-272f38e5d71b/go.mod h1:iHe1svFLAZg9VWz891+QbRMwUv9O/1Ww+/mngYeThbc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= @@ -1385,25 +829,14 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.44.0 h1:weqSxi/TMs1SqFRMHCtBgXRs8k3X39QIDEZ0pRcttUg= -google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= +google.golang.org/grpc v1.50.0 h1:fPVVDxY9w++VjTZsYvXWqEf9Rqar/e+9zYfxKK+W+YU= +google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1414,47 +847,32 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U= -gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= -gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= -gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0= -gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -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.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= 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= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -1463,9 +881,6 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k= -nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= -sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/router/keeper/keeper.go b/router/keeper/keeper.go index e06b66f..6e47911 100644 --- a/router/keeper/keeper.go +++ b/router/keeper/keeper.go @@ -18,7 +18,6 @@ import ( channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" host "github.com/cosmos/ibc-go/v3/modules/core/24-host" coretypes "github.com/cosmos/ibc-go/v3/modules/core/types" - "github.com/strangelove-ventures/packet-forward-middleware/v3/router/parser" "github.com/strangelove-ventures/packet-forward-middleware/v3/router/types" ) @@ -33,6 +32,14 @@ type Keeper struct { distrKeeper types.DistributionKeeper } +type ForwardMetadata struct { + Receiver string `json:"receiver"` + Port string `json:"port"` + Channel string `json:"channel"` + Timeout time.Duration `json:"timeout"` + Retries *uint8 `json:"retries"` +} + var ( // Timeout height following IBC defaults DefaultTransferPacketTimeoutHeight = clienttypes.Height{ @@ -77,7 +84,8 @@ func (k Keeper) ForwardTransferPacket( inFlightPacket *types.InFlightPacket, srcPacket channeltypes.Packet, srcPacketSender string, - parsedReceiver *parser.ParsedReceiver, + receiver string, + metadata *ForwardMetadata, token sdk.Coin, maxRetries uint8, timeout time.Duration, @@ -91,7 +99,7 @@ func (k Keeper) ForwardTransferPacket( // pay fees if feeAmount.IsPositive() { - hostAccAddr, err := sdk.AccAddressFromBech32(parsedReceiver.HostAccAddr) + hostAccAddr, err := sdk.AccAddressFromBech32(receiver) if err != nil { return err } @@ -105,14 +113,14 @@ func (k Keeper) ForwardTransferPacket( } // send tokens to destination - _, err = k.transferKeeper.Transfer( + res, err := k.transferKeeper.Transfer( sdk.WrapSDKContext(ctx), transfertypes.NewMsgTransfer( - parsedReceiver.Port, - parsedReceiver.Channel, + metadata.Port, + metadata.Channel, packetCoin, - parsedReceiver.HostAccAddr, - parsedReceiver.Destination, + receiver, + metadata.Receiver, DefaultTransferPacketTimeoutHeight, uint64(ctx.BlockTime().UnixNano())+uint64(timeout.Nanoseconds()), ), @@ -122,10 +130,10 @@ func (k Keeper) ForwardTransferPacket( "error", err, "amount", packetCoin.Amount.String(), "denom", packetCoin.Denom, - "sender", parsedReceiver.HostAccAddr, - "receiver", parsedReceiver.Destination, - "port", parsedReceiver.Port, - "channel", parsedReceiver.Channel, + "sender", receiver, + "receiver", metadata.Receiver, + "port", metadata.Port, + "channel", metadata.Channel, ) return sdkerrors.Wrapf(sdkerrors.ErrInsufficientFunds, err.Error()) } @@ -146,29 +154,7 @@ func (k Keeper) ForwardTransferPacket( inFlightPacket.RetriesRemaining-- } - // [Begin] this is a workaround to get the sequence of the packet transfer above in ibc-go v3 through v5 - // since the sequence number is not returned by the `Transfer` or `SendTransfer` methods. - nextSequence, ok := k.channelKeeper.GetNextSequenceSend(ctx, parsedReceiver.Port, parsedReceiver.Channel) - if !ok { - return sdkerrors.Wrapf( - sdkerrors.ErrKeyNotFound, - fmt.Sprintf("unable to retrieve next send sequence on port: %s, channel: %s", - parsedReceiver.Port, parsedReceiver.Channel, - ), - ) - } - sequence := nextSequence - 1 - if sequence <= 0 { - return sdkerrors.Wrapf( - sdkerrors.ErrKeyNotFound, - fmt.Sprintf("unexpected sequence: %d, should be greater than 0. port: %s, channel: %s", - sequence, parsedReceiver.Port, parsedReceiver.Channel, - ), - ) - } - // [End] sequence workaround - - key := types.RefundPacketKey(parsedReceiver.Channel, parsedReceiver.Port, sequence) + key := types.RefundPacketKey(metadata.Channel, metadata.Port, res.Sequence) store := ctx.KVStore(k.storeKey) bz := k.cdc.MustMarshal(inFlightPacket) store.Set(key, bz) @@ -231,11 +217,10 @@ func (k Keeper) HandleTimeout( } // send transfer again - receiver := &parser.ParsedReceiver{ - HostAccAddr: data.Sender, - Destination: data.Receiver, - Channel: packet.SourceChannel, - Port: packet.SourcePort, + metadata := &ForwardMetadata{ + Receiver: data.Receiver, + Channel: packet.SourceChannel, + Port: packet.SourcePort, } amount, ok := sdk.NewIntFromString(data.Amount) @@ -255,7 +240,7 @@ func (k Keeper) HandleTimeout( var token = sdk.NewCoin(denom, amount) - return k.ForwardTransferPacket(ctx, &inFlightPacket, channeltypes.Packet{}, "", receiver, token, uint8(inFlightPacket.RetriesRemaining), time.Duration(inFlightPacket.Timeout)*time.Nanosecond, nil) + return k.ForwardTransferPacket(ctx, &inFlightPacket, channeltypes.Packet{}, "", data.Sender, metadata, token, uint8(inFlightPacket.RetriesRemaining), time.Duration(inFlightPacket.Timeout)*time.Nanosecond, nil) } func (k Keeper) RemoveInFlightPacket(ctx sdk.Context, packet channeltypes.Packet) { diff --git a/router/module.go b/router/module.go index 4978c4b..4c19d7b 100644 --- a/router/module.go +++ b/router/module.go @@ -25,7 +25,6 @@ import ( "github.com/spf13/cobra" "github.com/strangelove-ventures/packet-forward-middleware/v3/router/client/cli" "github.com/strangelove-ventures/packet-forward-middleware/v3/router/keeper" - "github.com/strangelove-ventures/packet-forward-middleware/v3/router/parser" "github.com/strangelove-ventures/packet-forward-middleware/v3/router/types" abci "github.com/tendermint/tendermint/abci/types" ) @@ -232,19 +231,15 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re return channeltypes.NewErrorAcknowledgement(err.Error()) } - // parse out any forwarding info - parsedReceiver, err := parser.ParseReceiverData(data.Receiver) + var metadata *keeper.ForwardMetadata + err := json.Unmarshal([]byte(data.Memo), metadata) if err != nil { - return channeltypes.NewErrorAcknowledgement(err.Error()) - } - - if !parsedReceiver.ShouldForward { + // not a packet that should be forwarded return am.app.OnRecvPacket(ctx, packet, relayer) } // Modify packet data to process packet transfer for this chain, omitting forwarding info newData := data - newData.Receiver = parsedReceiver.HostAccAddr bz, err := transfertypes.ModuleCdc.MarshalJSON(&newData) if err != nil { return channeltypes.NewErrorAcknowledgement(err.Error()) @@ -283,20 +278,20 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re var token = sdk.NewCoin(denom, sdk.NewIntFromUint64(unit.Uint64())) var timeout time.Duration - if parsedReceiver.Timeout.Nanoseconds() > 0 { - timeout = parsedReceiver.Timeout + if metadata.Timeout.Nanoseconds() > 0 { + timeout = metadata.Timeout } else { timeout = am.forwardTimeout } var retries uint8 - if parsedReceiver.ForwardRetries != nil { - retries = *parsedReceiver.ForwardRetries + if metadata.Retries != nil { + retries = *metadata.Retries } else { retries = am.retriesOnTimeout } - err = am.keeper.ForwardTransferPacket(ctx, nil, packet, data.Sender, parsedReceiver, token, retries, timeout, []metrics.Label{}) + err = am.keeper.ForwardTransferPacket(ctx, nil, packet, data.Sender, data.Receiver, metadata, token, retries, timeout, []metrics.Label{}) if err != nil { am.keeper.RefundForwardedPacket(ctx, packet, am.refundTimeout) ack = channeltypes.NewErrorAcknowledgement(err.Error()) diff --git a/router/parser/receiver_parser.go b/router/parser/receiver_parser.go deleted file mode 100644 index 0762456..0000000 --- a/router/parser/receiver_parser.go +++ /dev/null @@ -1,88 +0,0 @@ -package parser - -import ( - "fmt" - "strconv" - "strings" - "time" -) - -type ParsedReceiver struct { - ShouldForward bool - - HostAccAddr string - Destination string - Port string - Channel string - Timeout time.Duration - ForwardRetries *uint8 -} - -// For now this assumes one hop, should be better parsing -func ParseReceiverData(receiverData string) (*ParsedReceiver, error) { - sep1 := strings.Split(receiverData, ":") - - receiver := &ParsedReceiver{ - ShouldForward: false, - } - - // Standard address - if len(sep1) == 1 && sep1[0] != "" { - return receiver, nil - } - - receiver.ShouldForward = true - - if len(sep1) < 2 || sep1[1] == "" { - return nil, fmt.Errorf("unparsable receiver field, need: '{address_on_this_chain}|{portid}/{channelid}(|{forward_timeout}(|{forward_retries})?)?:{final_dest_address}', got: '%s'", receiverData) - } - - // Final destination is the rest of the string after the first :, might be more multihops - receiver.Destination = strings.Join(sep1[1:], ":") - - // Parse transfer fields - sep2 := strings.Split(sep1[0], "|") - if len(sep2) < 2 { - return nil, fmt.Errorf("formatting incorrect, need: '{address_on_this_chain}|{portid}/{channelid}(|{forward_timeout}(|{forward_retries})?)?:{final_dest_address}', got: '%s'", receiverData) - } - - if len(sep2) > 2 { - timeout, err := time.ParseDuration(sep2[2]) - if err != nil { - return nil, fmt.Errorf("unparsable timeout, need: '{address_on_this_chain}|{portid}/{channelid}(|{forward_timeout}(|{forward_retries})?)?:{final_dest_address}', got: '%s'", receiverData) - } - receiver.Timeout = timeout - - if len(sep2) > 3 { - retries, err := strconv.ParseUint(sep2[3], 10, 8) - if err != nil { - return nil, fmt.Errorf("unparsable retries, need: '{address_on_this_chain}|{portid}/{channelid}(|{forward_timeout}(|{forward_retries})?)?:{final_dest_address}', got: '%s'", receiverData) - } - retriesUint8 := uint8(retries) - receiver.ForwardRetries = &retriesUint8 - } - } - - receiver.HostAccAddr = sep2[0] - - sep3 := strings.Split(sep2[1], "/") - if len(sep3) != 2 { - return nil, fmt.Errorf("formatting incorrect, need: '{address_on_this_chain}|{portid}/{channelid}(|{forward_timeout}(|{forward_retries})?)?:{final_dest_address}', got: '%s'", receiverData) - } - receiver.Port = sep3[0] - receiver.Channel = sep3[1] - - return receiver, nil -} - -// sending chain receiver field -// cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k|transfer/channel-0:cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k|transfer/channel-0: cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k|transfer/channel-0:cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k - -// first proxy chain receiver field -// cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k|transfer/channel-0:cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k|transfer/channel-0:cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k - -// second proxy chain receiver field -// somm16plylpsgxechajltx9yeseqexzdzut9g8vla4k|transfer/channel-0:cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k - -// final proxy chain receiver field -// cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k diff --git a/router/parser/receiver_parser_test.go b/router/parser/receiver_parser_test.go deleted file mode 100644 index 7078b51..0000000 --- a/router/parser/receiver_parser_test.go +++ /dev/null @@ -1,123 +0,0 @@ -package parser_test - -import ( - "testing" - "time" - - "github.com/strangelove-ventures/packet-forward-middleware/v3/router/parser" - "github.com/stretchr/testify/require" -) - -func TestParseReceiverDataTransfer(t *testing.T) { - data := "cosmos1vzxkv3lxccnttr9rs0002s93sgw72h7ghukuhs|transfer/channel-0:cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k" - pt, err := parser.ParseReceiverData(data) - - require.NoError(t, err) - require.True(t, pt.ShouldForward) - require.Equal(t, pt.HostAccAddr, "cosmos1vzxkv3lxccnttr9rs0002s93sgw72h7ghukuhs") - require.Equal(t, pt.Destination, "cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k") - require.Equal(t, pt.Port, "transfer") - require.Equal(t, pt.Channel, "channel-0") - require.Equal(t, pt.Timeout, 0*time.Nanosecond) - require.Nil(t, pt.ForwardRetries) -} - -func TestParseReceiverWithTimeout(t *testing.T) { - data := "cosmos1vzxkv3lxccnttr9rs0002s93sgw72h7ghukuhs|transfer/channel-0|4s:cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k" - pt, err := parser.ParseReceiverData(data) - - require.NoError(t, err) - require.True(t, pt.ShouldForward) - require.Equal(t, pt.HostAccAddr, "cosmos1vzxkv3lxccnttr9rs0002s93sgw72h7ghukuhs") - require.Equal(t, pt.Destination, "cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k") - require.Equal(t, pt.Port, "transfer") - require.Equal(t, pt.Channel, "channel-0") - require.Equal(t, pt.Timeout, 4*time.Second) - require.Nil(t, pt.ForwardRetries) - -} - -func TestParseReceiverWithRetriesAndTimeout(t *testing.T) { - data := "cosmos1vzxkv3lxccnttr9rs0002s93sgw72h7ghukuhs|transfer/channel-0|10m|5:cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k" - pt, err := parser.ParseReceiverData(data) - - require.NoError(t, err) - require.True(t, pt.ShouldForward) - require.Equal(t, pt.HostAccAddr, "cosmos1vzxkv3lxccnttr9rs0002s93sgw72h7ghukuhs") - require.Equal(t, pt.Destination, "cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k") - require.Equal(t, pt.Port, "transfer") - require.Equal(t, pt.Channel, "channel-0") - require.Equal(t, pt.Timeout, 10*time.Minute) - require.Equal(t, *pt.ForwardRetries, uint8(5)) -} - -func TestParseReceiverWithAnotherMultihop(t *testing.T) { - data := "cosmos1vzxkv3lxccnttr9rs0002s93sgw72h7ghukuhs|transfer/channel-0|10m|5:cosmos1vzxkv3lxccnttr9rs0002s93sgw72h7ghukuhs|transfer/channel-0|10m|5:cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k" - pt, err := parser.ParseReceiverData(data) - - require.NoError(t, err) - require.True(t, pt.ShouldForward) - require.Equal(t, pt.HostAccAddr, "cosmos1vzxkv3lxccnttr9rs0002s93sgw72h7ghukuhs") - require.Equal(t, pt.Destination, "cosmos1vzxkv3lxccnttr9rs0002s93sgw72h7ghukuhs|transfer/channel-0|10m|5:cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k") - require.Equal(t, pt.Port, "transfer") - require.Equal(t, pt.Channel, "channel-0") - require.Equal(t, pt.Timeout, 10*time.Minute) - require.Equal(t, *pt.ForwardRetries, uint8(5)) -} - -func TestParseReceiverDataNoTransfer(t *testing.T) { - data := "cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k" - pt, err := parser.ParseReceiverData(data) - - require.NoError(t, err) - require.False(t, pt.ShouldForward) -} - -func TestParseReceiverDataErrors(t *testing.T) { - testCases := []struct { - name string - data string - errStartsWith string - }{ - { - "unparsable transfer field", - "", - "unparsable receiver", - }, - { - "unparsable transfer field", - "abc:", - "unparsable receiver", - }, - { - "missing pipe", - "transfer/channel-0:cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k", - "formatting incorrect", - }, - { - "missing slash", - "cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k|transfer\\channel-0:cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k", - "formatting incorrect", - }, - { - "unparsable timeout", - "cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k|transfer\\channel-0|abc:cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k", - "unparsable timeout", - }, - { - "unparsable retries", - "cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k|transfer\\channel-0|10s|abc:cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k", - "unparsable retries", - }, - } - - for _, tc := range testCases { - tc := tc - - t.Run(tc.name, func(t *testing.T) { - _, err := parser.ParseReceiverData(tc.data) - require.Error(t, err) - require.Equal(t, err.Error()[:len(tc.errStartsWith)], tc.errStartsWith) - }) - } -} From da2ecc902a58479354bb9465218da5a61272949b Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Fri, 28 Oct 2022 13:28:23 -0600 Subject: [PATCH 02/24] Bring in PacketMetadata wrapper type. Unwrap next metadata for multihop. Fix existing tests. Add multihop test --- router/keeper/keeper.go | 58 ++++++++++++---- router/module.go | 25 +++---- router/module_test.go | 150 +++++++++++++++++++++++++++++++++++----- 3 files changed, 188 insertions(+), 45 deletions(-) diff --git a/router/keeper/keeper.go b/router/keeper/keeper.go index 6e47911..951f711 100644 --- a/router/keeper/keeper.go +++ b/router/keeper/keeper.go @@ -1,6 +1,7 @@ package keeper import ( + "encoding/json" "fmt" "time" @@ -32,12 +33,31 @@ type Keeper struct { distrKeeper types.DistributionKeeper } +type PacketMetadata struct { + Forward *ForwardMetadata `json:"forward"` +} + type ForwardMetadata struct { - Receiver string `json:"receiver"` - Port string `json:"port"` - Channel string `json:"channel"` - Timeout time.Duration `json:"timeout"` - Retries *uint8 `json:"retries"` + Receiver string `json:"receiver"` + Port string `json:"port"` + Channel string `json:"channel"` + Timeout time.Duration `json:"timeout"` + Retries *uint8 `json:"retries"` + Next *PacketMetadata `json:"next"` +} + +func (m *ForwardMetadata) Validate() error { + if m.Receiver == "" { + return fmt.Errorf("failed to validate forward metadata. receiver cannot be empty") + } + if m.Port == "" { + return fmt.Errorf("failed to validate forward metadata. port cannot be empty") + } + if m.Channel == "" { + return fmt.Errorf("failed to validate forward metadata. channel cannot be empty") + } + + return nil } var ( @@ -112,18 +132,28 @@ func (k Keeper) ForwardTransferPacket( } } + msgTransfer := transfertypes.NewMsgTransfer( + metadata.Port, + metadata.Channel, + packetCoin, + receiver, + metadata.Receiver, + DefaultTransferPacketTimeoutHeight, + uint64(ctx.BlockTime().UnixNano())+uint64(timeout.Nanoseconds()), + ) + + if metadata.Next != nil { + memo, err := json.Marshal(metadata.Next) + if err != nil { + return sdkerrors.Wrapf(sdkerrors.ErrJSONMarshal, err.Error()) + } + msgTransfer.Memo = string(memo) + } + // send tokens to destination res, err := k.transferKeeper.Transfer( sdk.WrapSDKContext(ctx), - transfertypes.NewMsgTransfer( - metadata.Port, - metadata.Channel, - packetCoin, - receiver, - metadata.Receiver, - DefaultTransferPacketTimeoutHeight, - uint64(ctx.BlockTime().UnixNano())+uint64(timeout.Nanoseconds()), - ), + msgTransfer, ) if err != nil { k.Logger(ctx).Error("packetForwardMiddleware SendPacketTransfer error", diff --git a/router/module.go b/router/module.go index 4c19d7b..509c085 100644 --- a/router/module.go +++ b/router/module.go @@ -231,32 +231,29 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re return channeltypes.NewErrorAcknowledgement(err.Error()) } - var metadata *keeper.ForwardMetadata - err := json.Unmarshal([]byte(data.Memo), metadata) - if err != nil { + m := &keeper.PacketMetadata{} + err := json.Unmarshal([]byte(data.Memo), m) + if err != nil || m.Forward == nil { // not a packet that should be forwarded return am.app.OnRecvPacket(ctx, packet, relayer) } - // Modify packet data to process packet transfer for this chain, omitting forwarding info - newData := data - bz, err := transfertypes.ModuleCdc.MarshalJSON(&newData) - if err != nil { + metadata := m.Forward + + if err := metadata.Validate(); err != nil { return channeltypes.NewErrorAcknowledgement(err.Error()) } - newPacket := packet - newPacket.Data = bz - ack := am.app.OnRecvPacket(ctx, newPacket, relayer) + ack := am.app.OnRecvPacket(ctx, packet, relayer) if ack.Success() { // recalculate denom, skip checks that were already done in app.OnRecvPacket var err error // TODO put denom handling in separate function var denom string - if transfertypes.ReceiverChainIsSource(packet.GetSourcePort(), packet.GetSourceChannel(), newData.Denom) { + if transfertypes.ReceiverChainIsSource(packet.GetSourcePort(), packet.GetSourceChannel(), data.Denom) { // remove prefix added by sender chain voucherPrefix := transfertypes.GetDenomPrefix(packet.GetSourcePort(), packet.GetSourceChannel()) - unprefixedDenom := newData.Denom[len(voucherPrefix):] + unprefixedDenom := data.Denom[len(voucherPrefix):] // coin denomination used in sending from the escrow address denom = unprefixedDenom @@ -268,10 +265,10 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re denom = denomTrace.IBCDenom() } } else { - prefixedDenom := transfertypes.GetDenomPrefix(packet.GetDestPort(), packet.GetDestChannel()) + newData.Denom + prefixedDenom := transfertypes.GetDenomPrefix(packet.GetDestPort(), packet.GetDestChannel()) + data.Denom denom = transfertypes.ParseDenomTrace(prefixedDenom).IBCDenom() } - unit, err := sdk.ParseUint(newData.Amount) + unit, err := sdk.ParseUint(data.Amount) if err != nil { channeltypes.NewErrorAcknowledgement(err.Error()) } diff --git a/router/module_test.go b/router/module_test.go index f57c402..f9f3c34 100644 --- a/router/module_test.go +++ b/router/module_test.go @@ -1,6 +1,7 @@ package router_test import ( + "encoding/json" "testing" sdk "github.com/cosmos/cosmos-sdk/types" @@ -33,12 +34,19 @@ func emptyPacket() channeltypes.Packet { return channeltypes.Packet{} } -func transferPacket(t *testing.T, receiver string) channeltypes.Packet { +func transferPacket(t *testing.T, receiver string, metadata *keeper.PacketMetadata) channeltypes.Packet { transferPacket := transfertypes.FungibleTokenPacketData{ Denom: testDenom, Amount: testAmount, Receiver: receiver, } + + if metadata != nil { + memo, err := json.Marshal(metadata) + require.NoError(t, err) + transferPacket.Memo = string(memo) + } + transferData, err := transfertypes.ModuleCdc.MarshalJSON(&transferPacket) require.NoError(t, err) @@ -82,15 +90,20 @@ func TestOnRecvPacket_InvalidReceiver(t *testing.T) { // Test data senderAccAddr := test.AccAddress() - packet := transferPacket(t, "") + packet := transferPacket(t, "", nil) + + // Expected mocks + gomock.InOrder( + setup.Mocks.IBCModuleMock.EXPECT().OnRecvPacket(ctx, packet, senderAccAddr). + Return(channeltypes.NewResultAcknowledgement([]byte("test"))), + ) ack := routerModule.OnRecvPacket(ctx, packet, senderAccAddr) - require.False(t, ack.Success()) + require.True(t, ack.Success()) expectedAck := &channeltypes.Acknowledgement{} err := cdc.UnmarshalJSON(ack.Acknowledgement(), expectedAck) require.NoError(t, err) - require.Equal(t, "unparsable receiver field, need: '{address_on_this_chain}|{portid}/{channelid}(|{forward_timeout}(|{forward_retries})?)?:{final_dest_address}', got: ''", expectedAck.GetError()) } func TestOnRecvPacket_NoForward(t *testing.T) { @@ -103,7 +116,7 @@ func TestOnRecvPacket_NoForward(t *testing.T) { // Test data senderAccAddr := test.AccAddress() - packet := transferPacket(t, "cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k") + packet := transferPacket(t, "cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k", nil) // Expected mocks gomock.InOrder( @@ -129,7 +142,7 @@ func TestOnRecvPacket_RecvPacketFailed(t *testing.T) { routerModule := setup.RouterModule senderAccAddr := test.AccAddress() - packet := transferPacket(t, "cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k") + packet := transferPacket(t, "cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k", nil) // Expected mocks gomock.InOrder( @@ -164,12 +177,17 @@ func TestOnRecvPacket_ForwardNoFee(t *testing.T) { denom := makeIBCDenom(testDestinationPort, testDestinationChannel, testDenom) senderAccAddr := test.AccAddress() testCoin := sdk.NewCoin(denom, sdk.NewInt(100)) - packetOrig := transferPacket(t, test.MakeForwardReceiver(hostAddr, port, channel, destAddr)) - packetFw := transferPacket(t, hostAddr) + packetOrig := transferPacket(t, hostAddr, &keeper.PacketMetadata{ + Forward: &keeper.ForwardMetadata{ + Receiver: destAddr, + Port: port, + Channel: channel, + }, + }) // Expected mocks gomock.InOrder( - setup.Mocks.IBCModuleMock.EXPECT().OnRecvPacket(ctx, packetFw, senderAccAddr). + setup.Mocks.IBCModuleMock.EXPECT().OnRecvPacket(ctx, packetOrig, senderAccAddr). Return(channeltypes.NewResultAcknowledgement([]byte("test"))), setup.Mocks.TransferKeeperMock.EXPECT().Transfer( @@ -183,9 +201,7 @@ func TestOnRecvPacket_ForwardNoFee(t *testing.T) { keeper.DefaultTransferPacketTimeoutHeight, uint64(ctx.BlockTime().UnixNano())+uint64(keeper.DefaultForwardTransferPacketTimeoutTimestamp.Nanoseconds()), ), - ).Return(&apptypes.MsgTransferResponse{}, nil), - - setup.Mocks.ChannelKeeperMock.EXPECT().GetNextSequenceSend(ctx, port, channel).Return(uint64(0), true), + ).Return(&apptypes.MsgTransferResponse{Sequence: 0}, nil), ) ack := routerModule.OnRecvPacket(ctx, packetOrig, senderAccAddr) @@ -219,12 +235,17 @@ func TestOnRecvPacket_ForwardWithFee(t *testing.T) { hostAccAddr := test.AccAddressFromBech32(t, hostAddr) testCoin := sdk.NewCoin(denom, sdk.NewInt(90)) feeCoins := sdk.Coins{sdk.NewCoin(denom, sdk.NewInt(10))} - packetOrig := transferPacket(t, test.MakeForwardReceiver(hostAddr, port, channel, destAddr)) - packetFw := transferPacket(t, hostAddr) + packetOrig := transferPacket(t, hostAddr, &keeper.PacketMetadata{ + Forward: &keeper.ForwardMetadata{ + Receiver: destAddr, + Port: port, + Channel: channel, + }, + }) // Expected mocks gomock.InOrder( - setup.Mocks.IBCModuleMock.EXPECT().OnRecvPacket(ctx, packetFw, senderAccAddr). + setup.Mocks.IBCModuleMock.EXPECT().OnRecvPacket(ctx, packetOrig, senderAccAddr). Return(channeltypes.NewResultAcknowledgement([]byte("test"))), setup.Mocks.DistributionKeeperMock.EXPECT().FundCommunityPool( @@ -244,9 +265,96 @@ func TestOnRecvPacket_ForwardWithFee(t *testing.T) { keeper.DefaultTransferPacketTimeoutHeight, uint64(ctx.BlockTime().UnixNano())+uint64(keeper.DefaultForwardTransferPacketTimeoutTimestamp.Nanoseconds()), ), - ).Return(&apptypes.MsgTransferResponse{}, nil), + ).Return(&apptypes.MsgTransferResponse{Sequence: 0}, nil), + ) - setup.Mocks.ChannelKeeperMock.EXPECT().GetNextSequenceSend(ctx, port, channel).Return(uint64(0), true), + ack := routerModule.OnRecvPacket(ctx, packetOrig, senderAccAddr) + require.True(t, ack.Success()) + + expectedAck := &channeltypes.Acknowledgement{} + err = cdc.UnmarshalJSON(ack.Acknowledgement(), expectedAck) + require.NoError(t, err) + require.Equal(t, "test", string(expectedAck.GetResult())) +} + +func TestOnRecvPacket_ForwardMultihop(t *testing.T) { + var err error + ctl := gomock.NewController(t) + defer ctl.Finish() + setup := test.NewTestSetup(t, ctl) + ctx := setup.Initializer.Ctx + cdc := setup.Initializer.Marshaler + routerModule := setup.RouterModule + + // Test data + hostAddr := "cosmos1vzxkv3lxccnttr9rs0002s93sgw72h7ghukuhs" + hostAddr2 := "cosmos1q4p4gx889lfek5augdurrjclwtqvjhuntm6j4m" + destAddr := "cosmos16plylpsgxechajltx9yeseqexzdzut9g8vla4k" + port := "transfer" + channel := "channel-0" + channel2 := "channel-1" + denom := makeIBCDenom(testDestinationPort, testDestinationChannel, testDenom) + senderAccAddr := test.AccAddress() + senderAccAddr2 := test.AccAddress() + testCoin := sdk.NewCoin(denom, sdk.NewInt(100)) + nextMetadata := &keeper.PacketMetadata{ + Forward: &keeper.ForwardMetadata{ + Receiver: destAddr, + Port: port, + Channel: channel2, + }, + } + packetOrig := transferPacket(t, hostAddr, &keeper.PacketMetadata{ + Forward: &keeper.ForwardMetadata{ + Receiver: hostAddr2, + Port: port, + Channel: channel, + Next: nextMetadata, + }, + }) + packet2 := transferPacket(t, hostAddr2, nextMetadata) + + msgTransfer1 := transfertypes.NewMsgTransfer( + port, + channel, + testCoin, + hostAddr, + hostAddr2, + keeper.DefaultTransferPacketTimeoutHeight, + uint64(ctx.BlockTime().UnixNano())+uint64(keeper.DefaultForwardTransferPacketTimeoutTimestamp.Nanoseconds()), + ) + memo1, err := json.Marshal(nextMetadata) + require.NoError(t, err) + msgTransfer1.Memo = string(memo1) + + msgTransfer2 := transfertypes.NewMsgTransfer( + port, + channel2, + testCoin, + hostAddr2, + destAddr, + keeper.DefaultTransferPacketTimeoutHeight, + uint64(ctx.BlockTime().UnixNano())+uint64(keeper.DefaultForwardTransferPacketTimeoutTimestamp.Nanoseconds()), + ) + // no memo on final forward + + // Expected mocks + gomock.InOrder( + setup.Mocks.IBCModuleMock.EXPECT().OnRecvPacket(ctx, packetOrig, senderAccAddr). + Return(channeltypes.NewResultAcknowledgement([]byte("test"))), + + setup.Mocks.TransferKeeperMock.EXPECT().Transfer( + sdk.WrapSDKContext(ctx), + msgTransfer1, + ).Return(&apptypes.MsgTransferResponse{Sequence: 0}, nil), + + setup.Mocks.IBCModuleMock.EXPECT().OnRecvPacket(ctx, packet2, senderAccAddr2). + Return(channeltypes.NewResultAcknowledgement([]byte("test"))), + + setup.Mocks.TransferKeeperMock.EXPECT().Transfer( + sdk.WrapSDKContext(ctx), + msgTransfer2, + ).Return(&apptypes.MsgTransferResponse{Sequence: 0}, nil), ) ack := routerModule.OnRecvPacket(ctx, packetOrig, senderAccAddr) @@ -256,4 +364,12 @@ func TestOnRecvPacket_ForwardWithFee(t *testing.T) { err = cdc.UnmarshalJSON(ack.Acknowledgement(), expectedAck) require.NoError(t, err) require.Equal(t, "test", string(expectedAck.GetResult())) + + ack2 := routerModule.OnRecvPacket(ctx, packet2, senderAccAddr2) + require.True(t, ack2.Success()) + + expectedAck2 := &channeltypes.Acknowledgement{} + err = cdc.UnmarshalJSON(ack2.Acknowledgement(), expectedAck2) + require.NoError(t, err) + require.Equal(t, "test", string(expectedAck2.GetResult())) } From 26fedfe6c463ff3ef384be230eaa24e0ef51e72e Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Fri, 4 Nov 2022 10:30:36 -0600 Subject: [PATCH 03/24] Better validation of port and channel. Use string for next memo --- router/keeper/keeper.go | 31 +++++++++++++------------------ router/module_test.go | 4 +++- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/router/keeper/keeper.go b/router/keeper/keeper.go index 951f711..4ffbc22 100644 --- a/router/keeper/keeper.go +++ b/router/keeper/keeper.go @@ -1,7 +1,6 @@ package keeper import ( - "encoding/json" "fmt" "time" @@ -38,23 +37,24 @@ type PacketMetadata struct { } type ForwardMetadata struct { - Receiver string `json:"receiver"` - Port string `json:"port"` - Channel string `json:"channel"` - Timeout time.Duration `json:"timeout"` - Retries *uint8 `json:"retries"` - Next *PacketMetadata `json:"next"` + SourceKey string + Receiver string `json:"receiver"` + Port string `json:"port"` + Channel string `json:"channel"` + Timeout time.Duration `json:"timeout"` + Retries *uint8 `json:"retries"` + Next string `json:"next"` } func (m *ForwardMetadata) Validate() error { if m.Receiver == "" { return fmt.Errorf("failed to validate forward metadata. receiver cannot be empty") } - if m.Port == "" { - return fmt.Errorf("failed to validate forward metadata. port cannot be empty") + if err := host.PortIdentifierValidator(m.Port); err != nil { + return fmt.Errorf("failed to validate forward metadata: %w", err) } - if m.Channel == "" { - return fmt.Errorf("failed to validate forward metadata. channel cannot be empty") + if err := host.ChannelIdentifierValidator(m.Channel); err != nil { + return fmt.Errorf("failed to validate forward metadata: %w", err) } return nil @@ -142,13 +142,8 @@ func (k Keeper) ForwardTransferPacket( uint64(ctx.BlockTime().UnixNano())+uint64(timeout.Nanoseconds()), ) - if metadata.Next != nil { - memo, err := json.Marshal(metadata.Next) - if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrJSONMarshal, err.Error()) - } - msgTransfer.Memo = string(memo) - } + // set memo for next transfer with next from this transfer. + msgTransfer.Memo = metadata.Next // send tokens to destination res, err := k.transferKeeper.Transfer( diff --git a/router/module_test.go b/router/module_test.go index f9f3c34..d4cb23b 100644 --- a/router/module_test.go +++ b/router/module_test.go @@ -304,12 +304,14 @@ func TestOnRecvPacket_ForwardMultihop(t *testing.T) { Channel: channel2, }, } + next, err := json.Marshal(nextMetadata) + require.NoError(t, err) packetOrig := transferPacket(t, hostAddr, &keeper.PacketMetadata{ Forward: &keeper.ForwardMetadata{ Receiver: hostAddr2, Port: port, Channel: channel, - Next: nextMetadata, + Next: string(next), }, }) packet2 := transferPacket(t, hostAddr2, nextMetadata) From e0b798f2785250c3d51e22d6ee0b8045857d26ae Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Fri, 4 Nov 2022 18:23:26 -0600 Subject: [PATCH 04/24] Pass sequence in refund transfers for multi-hop refunds --- go.sum | 2 - proto/router/v1/genesis.proto | 6 +- router/keeper/keeper.go | 94 ++++++++++++++++------------ router/module.go | 35 ++++++++++- router/module_test.go | 7 ++- router/types/genesis.pb.go | 112 ++++++++++++++++++++++------------ 6 files changed, 169 insertions(+), 87 deletions(-) diff --git a/go.sum b/go.sum index 04ceb11..2abb27e 100644 --- a/go.sum +++ b/go.sum @@ -118,8 +118,6 @@ github.com/cosmos/iavl v0.19.3 h1:cESO0OwTTxQm5rmyESKW+zESheDUYI7CcZDWWDwnuxg= github.com/cosmos/iavl v0.19.3/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= github.com/cosmos/ibc-go/v3 v3.0.0-rc2.0.20221027123302-68845e541902 h1:k6Uoi9bIX2SOjr3JG7WjNzy/QjL6WOuEfRe0rq7ARm4= github.com/cosmos/ibc-go/v3 v3.0.0-rc2.0.20221027123302-68845e541902/go.mod h1:VUWLHw0C3USmTQZnTdkuXXdUdLbW8zsK3lV1Ieposog= -github.com/cosmos/ibc-go/v3 v3.3.1 h1:i8o3iPSPN8fr7AjCPQnHEKz/VfeMrxc8mjvgAw6txWk= -github.com/cosmos/ibc-go/v3 v3.3.1/go.mod h1:V1nliDk/5q5KWr0mup7M76oN4SY0IOU371SKbCV2wN0= github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4= github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY= github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI= diff --git a/proto/router/v1/genesis.proto b/proto/router/v1/genesis.proto index 9a47f6d..3966884 100644 --- a/proto/router/v1/genesis.proto +++ b/proto/router/v1/genesis.proto @@ -7,7 +7,6 @@ option go_package = "github.com/strangelove-ventures/packet-forward-middleware/v import "gogoproto/gogo.proto"; // GenesisState defines the router genesis state - message GenesisState { Params params = 1 [ (gogoproto.nullable) = false ]; @@ -33,6 +32,7 @@ message InFlightPacket { string original_sender_address = 1; string refund_channel_id = 2; string refund_port_id = 3; - int32 retries_remaining = 4; - uint64 timeout = 5; + uint64 refund_sequence = 4; + int32 retries_remaining = 5; + uint64 timeout = 6; } \ No newline at end of file diff --git a/router/keeper/keeper.go b/router/keeper/keeper.go index 4ffbc22..0cf226b 100644 --- a/router/keeper/keeper.go +++ b/router/keeper/keeper.go @@ -1,6 +1,7 @@ package keeper import ( + "encoding/json" "fmt" "time" @@ -37,13 +38,13 @@ type PacketMetadata struct { } type ForwardMetadata struct { - SourceKey string - Receiver string `json:"receiver"` - Port string `json:"port"` - Channel string `json:"channel"` - Timeout time.Duration `json:"timeout"` - Retries *uint8 `json:"retries"` - Next string `json:"next"` + Receiver string `json:"receiver"` + Port string `json:"port"` + Channel string `json:"channel"` + Timeout time.Duration `json:"timeout"` + Retries *uint8 `json:"retries,omitempty"` + Next *string `json:"next,omitempty"` + RefundSequence *uint64 `json:"refund_sequence,omitempty"` } func (m *ForwardMetadata) Validate() error { @@ -143,7 +144,9 @@ func (k Keeper) ForwardTransferPacket( ) // set memo for next transfer with next from this transfer. - msgTransfer.Memo = metadata.Next + if metadata.Next != nil { + msgTransfer.Memo = *metadata.Next + } // send tokens to destination res, err := k.transferKeeper.Transfer( @@ -172,6 +175,7 @@ func (k Keeper) ForwardTransferPacket( OriginalSenderAddress: srcPacketSender, RefundChannelId: srcPacket.DestinationChannel, RefundPortId: srcPacket.DestinationPort, + RefundSequence: srcPacket.Sequence, RetriesRemaining: int32(maxRetries), Timeout: uint64(timeout.Nanoseconds()), } @@ -280,11 +284,11 @@ func (k Keeper) RemoveInFlightPacket(ctx sdk.Context, packet channeltypes.Packet store.Delete(key) } -func (k Keeper) RefundForwardedPacket(ctx sdk.Context, packet channeltypes.Packet, timeout time.Duration) { +func (k Keeper) RefundForwardedPacket(ctx sdk.Context, channel string, port string, refundSequence uint64, packetData transfertypes.FungibleTokenPacketData, timeout time.Duration) { store := ctx.KVStore(k.storeKey) - key := types.RefundPacketKey(packet.SourceChannel, packet.SourcePort, packet.Sequence) + key := types.RefundPacketKey(channel, port, refundSequence) if !store.Has(key) { - // not a forwarded packet, ignore. + // this is either not a forwarded packet, or it is the final destination for the refund. return } @@ -296,57 +300,69 @@ func (k Keeper) RefundForwardedPacket(ctx sdk.Context, packet channeltypes.Packe var inFlightPacket types.InFlightPacket k.cdc.MustUnmarshal(bz, &inFlightPacket) - // Parse packet data - var data transfertypes.FungibleTokenPacketData - if err := transfertypes.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { - k.Logger(ctx).Error("packetForwardMiddleware error unmarshalling packet data for refund", + amount, ok := sdk.NewIntFromString(packetData.Amount) + if !ok { + k.Logger(ctx).Error("packetForwardMiddleware error parsing amount from string for multi-hop refund", "key", string(key), - "sequence", packet.Sequence, - "channel-id", packet.SourceChannel, - "port-id", packet.SourcePort, + "sequence", refundSequence, + "channel-id", channel, + "port-id", port, "original-sender-address", inFlightPacket.OriginalSenderAddress, "refund-channel-id", inFlightPacket.RefundChannelId, "refund-port-id", inFlightPacket.RefundPortId, + "refund-sequence", inFlightPacket.RefundSequence, + "amount", packetData.Amount, ) return } - amount, ok := sdk.NewIntFromString(data.Amount) - if !ok { - k.Logger(ctx).Error("packetForwardMiddleware error parsing amount from string for refund", + msgTransfer := transfertypes.NewMsgTransfer( + inFlightPacket.RefundPortId, + inFlightPacket.RefundChannelId, + sdk.NewCoin(transfertypes.ParseDenomTrace(packetData.Denom).IBCDenom(), amount), + packetData.Sender, + inFlightPacket.OriginalSenderAddress, + DefaultTransferPacketTimeoutHeight, + uint64(timeout.Nanoseconds())+uint64(ctx.BlockTime().UnixNano()), + ) + + packetMemo := &PacketMetadata{ + Forward: &ForwardMetadata{ + RefundSequence: &inFlightPacket.RefundSequence, + }, + } + + memo, err := json.Marshal(packetMemo) + if err != nil { + k.Logger(ctx).Error("packetForwardMiddleware error marshaling json for multi-hop refund sequence", "key", string(key), - "sequence", packet.Sequence, - "channel-id", packet.SourceChannel, - "port-id", packet.SourcePort, + "sequence", refundSequence, + "channel-id", channel, + "port-id", port, "original-sender-address", inFlightPacket.OriginalSenderAddress, "refund-channel-id", inFlightPacket.RefundChannelId, "refund-port-id", inFlightPacket.RefundPortId, - "amount", data.Amount, + "refund-sequence", inFlightPacket.RefundSequence, + "amount", packetData.Amount, ) return } + msgTransfer.Memo = string(memo) + if _, err := k.transferKeeper.Transfer( sdk.WrapSDKContext(ctx), - transfertypes.NewMsgTransfer( - inFlightPacket.RefundPortId, - inFlightPacket.RefundChannelId, - sdk.NewCoin(transfertypes.ParseDenomTrace(data.Denom).IBCDenom(), amount), - data.Sender, - inFlightPacket.OriginalSenderAddress, - DefaultTransferPacketTimeoutHeight, - uint64(timeout.Nanoseconds())+uint64(ctx.BlockTime().UnixNano()), - ), + msgTransfer, ); err != nil { - k.Logger(ctx).Error("packetForwardMiddleware error sending packet transfer for refund", + k.Logger(ctx).Error("packetForwardMiddleware error sending packet transfer for multi-hop refund", "key", string(key), - "sequence", packet.Sequence, - "channel-id", packet.SourceChannel, - "port-id", packet.SourcePort, + "sequence", refundSequence, + "channel-id", channel, + "port-id", port, "original-sender-address", inFlightPacket.OriginalSenderAddress, "refund-channel-id", inFlightPacket.RefundChannelId, "refund-port-id", inFlightPacket.RefundPortId, - "amount", data.Amount, + "amount", packetData.Amount, "error", err, ) } diff --git a/router/module.go b/router/module.go index 509c085..7f40e0f 100644 --- a/router/module.go +++ b/router/module.go @@ -240,6 +240,12 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re metadata := m.Forward + if m.Forward.RefundSequence != nil { + // pass along refund to previous hop in multi-hop, note that destination channel is used here since it is the OnRecvPacket. + am.keeper.RefundForwardedPacket(ctx, packet.DestinationChannel, packet.DestinationPort, *m.Forward.RefundSequence, data, am.refundTimeout) + return am.app.OnRecvPacket(ctx, packet, relayer) + } + if err := metadata.Validate(); err != nil { return channeltypes.NewErrorAcknowledgement(err.Error()) } @@ -290,7 +296,7 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re err = am.keeper.ForwardTransferPacket(ctx, nil, packet, data.Sender, data.Receiver, metadata, token, retries, timeout, []metrics.Label{}) if err != nil { - am.keeper.RefundForwardedPacket(ctx, packet, am.refundTimeout) + am.keeper.RefundForwardedPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence, data, am.refundTimeout) ack = channeltypes.NewErrorAcknowledgement(err.Error()) } } @@ -310,7 +316,19 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes if !ack.Success() { // If acknowledgement indicates error, no retries should be attempted. Refund will be initiated now. - am.keeper.RefundForwardedPacket(ctx, packet, am.refundTimeout) + + var data transfertypes.FungibleTokenPacketData + if err := transfertypes.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { + am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing packet data from ack for refund", + "sequence", packet.Sequence, + "channel-id", packet.SourceChannel, + "port-id", packet.SourcePort, + "error", err, + ) + return nil + } + + am.keeper.RefundForwardedPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence, data, am.refundTimeout) return nil } @@ -326,7 +344,18 @@ func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, } if err := am.keeper.HandleTimeout(ctx, packet); err != nil { - am.keeper.RefundForwardedPacket(ctx, packet, am.refundTimeout) + var data transfertypes.FungibleTokenPacketData + if err := transfertypes.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { + am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing packet data from timeout for refund", + "sequence", packet.Sequence, + "channel-id", packet.SourceChannel, + "port-id", packet.SourcePort, + "error", err, + ) + return nil + } + + am.keeper.RefundForwardedPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence, data, am.refundTimeout) } return nil diff --git a/router/module_test.go b/router/module_test.go index d4cb23b..160f497 100644 --- a/router/module_test.go +++ b/router/module_test.go @@ -304,14 +304,17 @@ func TestOnRecvPacket_ForwardMultihop(t *testing.T) { Channel: channel2, }, } - next, err := json.Marshal(nextMetadata) + nextBz, err := json.Marshal(nextMetadata) require.NoError(t, err) + + next := string(nextBz) + packetOrig := transferPacket(t, hostAddr, &keeper.PacketMetadata{ Forward: &keeper.ForwardMetadata{ Receiver: hostAddr2, Port: port, Channel: channel, - Next: string(next), + Next: &next, }, }) packet2 := transferPacket(t, hostAddr2, nextMetadata) diff --git a/router/types/genesis.pb.go b/router/types/genesis.pb.go index 46702c8..f9374d9 100644 --- a/router/types/genesis.pb.go +++ b/router/types/genesis.pb.go @@ -119,8 +119,9 @@ type InFlightPacket struct { OriginalSenderAddress string `protobuf:"bytes,1,opt,name=original_sender_address,json=originalSenderAddress,proto3" json:"original_sender_address,omitempty"` RefundChannelId string `protobuf:"bytes,2,opt,name=refund_channel_id,json=refundChannelId,proto3" json:"refund_channel_id,omitempty"` RefundPortId string `protobuf:"bytes,3,opt,name=refund_port_id,json=refundPortId,proto3" json:"refund_port_id,omitempty"` - RetriesRemaining int32 `protobuf:"varint,4,opt,name=retries_remaining,json=retriesRemaining,proto3" json:"retries_remaining,omitempty"` - Timeout uint64 `protobuf:"varint,5,opt,name=timeout,proto3" json:"timeout,omitempty"` + RefundSequence uint64 `protobuf:"varint,4,opt,name=refund_sequence,json=refundSequence,proto3" json:"refund_sequence,omitempty"` + RetriesRemaining int32 `protobuf:"varint,5,opt,name=retries_remaining,json=retriesRemaining,proto3" json:"retries_remaining,omitempty"` + Timeout uint64 `protobuf:"varint,6,opt,name=timeout,proto3" json:"timeout,omitempty"` } func (m *InFlightPacket) Reset() { *m = InFlightPacket{} } @@ -177,6 +178,13 @@ func (m *InFlightPacket) GetRefundPortId() string { return "" } +func (m *InFlightPacket) GetRefundSequence() uint64 { + if m != nil { + return m.RefundSequence + } + return 0 +} + func (m *InFlightPacket) GetRetriesRemaining() int32 { if m != nil { return m.RetriesRemaining @@ -201,40 +209,41 @@ func init() { func init() { proto.RegisterFile("router/v1/genesis.proto", fileDescriptor_4940b763c55c4e0b) } var fileDescriptor_4940b763c55c4e0b = []byte{ - // 516 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0xcb, 0x6e, 0xd3, 0x40, - 0x14, 0x8d, 0xf3, 0x42, 0x99, 0x96, 0xb4, 0xb1, 0x5a, 0xd5, 0x74, 0xe1, 0x44, 0x11, 0x42, 0x11, - 0x10, 0x5b, 0x6d, 0x25, 0x84, 0xba, 0x23, 0x3c, 0xaa, 0xec, 0x22, 0x77, 0x87, 0x84, 0xac, 0xa9, - 0xe7, 0xc6, 0x19, 0xc5, 0x9e, 0xb1, 0x66, 0xc6, 0x2e, 0xe1, 0x2b, 0x58, 0xf3, 0x45, 0x5d, 0x76, - 0x89, 0x58, 0x44, 0x90, 0xfc, 0x41, 0xbf, 0x00, 0xd9, 0xe3, 0x40, 0x22, 0x58, 0x79, 0xe6, 0x9c, - 0x73, 0x8f, 0xef, 0xb9, 0xba, 0x83, 0x4e, 0x04, 0x4f, 0x15, 0x08, 0x37, 0x3b, 0x73, 0x43, 0x60, - 0x20, 0xa9, 0x74, 0x12, 0xc1, 0x15, 0x37, 0x5b, 0x9a, 0x70, 0xb2, 0xb3, 0xd3, 0xa3, 0x90, 0x87, - 0xbc, 0x40, 0xdd, 0xfc, 0xa4, 0x05, 0xfd, 0x6f, 0x55, 0xb4, 0x7f, 0xa5, 0x4b, 0xae, 0x15, 0x56, - 0x60, 0xba, 0xa8, 0x99, 0x60, 0x81, 0x63, 0x69, 0x19, 0x3d, 0x63, 0xb0, 0x77, 0xde, 0x71, 0xfe, - 0x58, 0x38, 0x93, 0x82, 0x18, 0xd5, 0xef, 0x96, 0xdd, 0x8a, 0x57, 0xca, 0xcc, 0x2f, 0xa8, 0x43, - 0x99, 0x3f, 0x8d, 0x68, 0x38, 0x53, 0x7e, 0x82, 0x83, 0x39, 0x28, 0x69, 0x55, 0x7b, 0xb5, 0xc1, - 0xde, 0xf9, 0xcb, 0xad, 0xda, 0xed, 0x9f, 0x38, 0x63, 0xf6, 0xa1, 0xd0, 0x4f, 0xb4, 0xfc, 0x3d, - 0x53, 0x62, 0x31, 0xea, 0xe5, 0xb6, 0x0f, 0xcb, 0xae, 0xb5, 0xc0, 0x71, 0x74, 0xd9, 0xff, 0xc7, - 0xb4, 0xef, 0x1d, 0xd0, 0xdd, 0xba, 0xd3, 0x4f, 0xe8, 0xe8, 0x7f, 0x56, 0xe6, 0x21, 0xaa, 0xcd, - 0x61, 0x51, 0x24, 0x68, 0x79, 0xf9, 0xd1, 0x74, 0x51, 0x23, 0xc3, 0x51, 0x0a, 0x56, 0xb5, 0x48, - 0xf5, 0x64, 0xab, 0xb3, 0x5d, 0x07, 0x4f, 0xeb, 0x2e, 0xab, 0xaf, 0x8d, 0xfe, 0x67, 0xd4, 0xd4, - 0x91, 0x4d, 0x86, 0xda, 0x53, 0x00, 0x3f, 0x01, 0x11, 0x00, 0x53, 0x38, 0x04, 0xed, 0x3d, 0xba, - 0xca, 0x7b, 0xfe, 0xb1, 0xec, 0x3e, 0x0b, 0xa9, 0x9a, 0xa5, 0x37, 0x4e, 0xc0, 0x63, 0x37, 0xe0, - 0x32, 0xe6, 0xb2, 0xfc, 0x0c, 0x25, 0x99, 0xbb, 0x6a, 0x91, 0x80, 0x74, 0xde, 0x41, 0xf0, 0xb0, - 0xec, 0x1e, 0xeb, 0x74, 0xbb, 0x6e, 0x7d, 0xef, 0xf1, 0x14, 0x60, 0xf2, 0xf7, 0xfe, 0xcb, 0x40, - 0xed, 0xdd, 0xbe, 0xcc, 0x57, 0xe8, 0x84, 0x0b, 0x1a, 0x52, 0x86, 0x23, 0x5f, 0x02, 0x23, 0x20, - 0x7c, 0x4c, 0x88, 0x00, 0x29, 0xcb, 0x9c, 0xc7, 0x1b, 0xfa, 0xba, 0x60, 0xdf, 0x68, 0xd2, 0x7c, - 0x8e, 0x3a, 0x02, 0xa6, 0x29, 0x23, 0x7e, 0x30, 0xc3, 0x8c, 0x41, 0xe4, 0x53, 0x52, 0x4c, 0xa1, - 0xe5, 0x1d, 0x68, 0xe2, 0xad, 0xc6, 0xc7, 0xc4, 0x7c, 0x8a, 0xda, 0xa5, 0x36, 0xe1, 0x42, 0xe5, - 0xc2, 0x5a, 0x21, 0xdc, 0xd7, 0xe8, 0x84, 0x0b, 0x35, 0x26, 0xe6, 0x8b, 0xdc, 0x51, 0x09, 0x0a, - 0xd2, 0x17, 0x10, 0x63, 0xca, 0x28, 0x0b, 0xad, 0x7a, 0xcf, 0x18, 0x34, 0xbc, 0xc3, 0x92, 0xf0, - 0x36, 0xb8, 0x69, 0xa1, 0x47, 0x8a, 0xc6, 0xc0, 0x53, 0x65, 0x35, 0x7a, 0xc6, 0xa0, 0xee, 0x6d, - 0xae, 0xa3, 0xe0, 0x6e, 0x65, 0x1b, 0xf7, 0x2b, 0xdb, 0xf8, 0xb9, 0xb2, 0x8d, 0xaf, 0x6b, 0xbb, - 0x72, 0xbf, 0xb6, 0x2b, 0xdf, 0xd7, 0x76, 0xe5, 0xe3, 0x78, 0x6b, 0x9a, 0x52, 0x09, 0xcc, 0x42, - 0x88, 0x78, 0x06, 0xc3, 0x0c, 0x98, 0x4a, 0x05, 0x48, 0x57, 0x6f, 0xc4, 0x70, 0xca, 0xc5, 0x2d, - 0x16, 0x64, 0x18, 0x53, 0x42, 0x22, 0xb8, 0xc5, 0x02, 0xdc, 0xec, 0xc2, 0x2d, 0xdf, 0x42, 0x31, - 0xf4, 0x9b, 0x66, 0xb1, 0xe6, 0x17, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x43, 0x50, 0x11, 0xd0, - 0x22, 0x03, 0x00, 0x00, + // 534 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0xcd, 0x6e, 0xd3, 0x30, + 0x1c, 0x6f, 0xba, 0xb5, 0xa8, 0xde, 0xe8, 0x56, 0x6b, 0xd3, 0xc2, 0x0e, 0x69, 0x55, 0x21, 0xa8, + 0x80, 0x26, 0xda, 0x26, 0x21, 0xb4, 0x1b, 0xe5, 0x63, 0xea, 0xad, 0x4a, 0x6f, 0x48, 0x28, 0xf2, + 0x92, 0x7f, 0x53, 0xab, 0x89, 0x1d, 0x6c, 0x27, 0xa3, 0x3c, 0x02, 0x27, 0xce, 0x3c, 0xd1, 0x8e, + 0x3b, 0x22, 0x0e, 0x15, 0x6a, 0xdf, 0x60, 0x4f, 0x80, 0x12, 0xa7, 0xd0, 0x0a, 0x4e, 0xb5, 0x7f, + 0x5f, 0xfe, 0xff, 0xdc, 0x18, 0x9d, 0x08, 0x9e, 0x2a, 0x10, 0x4e, 0x76, 0xe6, 0x84, 0xc0, 0x40, + 0x52, 0x69, 0x27, 0x82, 0x2b, 0x8e, 0x1b, 0x9a, 0xb0, 0xb3, 0xb3, 0xd3, 0xa3, 0x90, 0x87, 0xbc, + 0x40, 0x9d, 0x7c, 0xa5, 0x05, 0xdd, 0xef, 0x55, 0xb4, 0x7f, 0xa5, 0x2d, 0x63, 0x45, 0x14, 0x60, + 0x07, 0xd5, 0x13, 0x22, 0x48, 0x2c, 0x4d, 0xa3, 0x63, 0xf4, 0xf6, 0xce, 0x5b, 0xf6, 0x9f, 0x08, + 0x7b, 0x54, 0x10, 0x83, 0xdd, 0xdb, 0x45, 0xbb, 0xe2, 0x96, 0x32, 0xfc, 0x05, 0xb5, 0x28, 0xf3, + 0x26, 0x11, 0x0d, 0xa7, 0xca, 0x4b, 0x88, 0x3f, 0x03, 0x25, 0xcd, 0x6a, 0x67, 0xa7, 0xb7, 0x77, + 0xfe, 0x62, 0xc3, 0xbb, 0x79, 0x88, 0x3d, 0x64, 0xef, 0x0b, 0xfd, 0x48, 0xcb, 0xdf, 0x31, 0x25, + 0xe6, 0x83, 0x4e, 0x1e, 0x7b, 0xbf, 0x68, 0x9b, 0x73, 0x12, 0x47, 0x97, 0xdd, 0x7f, 0x42, 0xbb, + 0xee, 0x01, 0xdd, 0xf6, 0x9d, 0x7e, 0x44, 0x47, 0xff, 0x8b, 0xc2, 0x87, 0x68, 0x67, 0x06, 0xf3, + 0xa2, 0x41, 0xc3, 0xcd, 0x97, 0xd8, 0x41, 0xb5, 0x8c, 0x44, 0x29, 0x98, 0xd5, 0xa2, 0xd5, 0xa3, + 0x8d, 0xc9, 0xb6, 0x13, 0x5c, 0xad, 0xbb, 0xac, 0xbe, 0x32, 0xba, 0x9f, 0x51, 0x5d, 0x57, 0xc6, + 0x0c, 0x35, 0x27, 0x00, 0x5e, 0x02, 0xc2, 0x07, 0xa6, 0x48, 0x08, 0x3a, 0x7b, 0x70, 0x95, 0xcf, + 0xfc, 0x73, 0xd1, 0x7e, 0x12, 0x52, 0x35, 0x4d, 0xaf, 0x6d, 0x9f, 0xc7, 0x8e, 0xcf, 0x65, 0xcc, + 0x65, 0xf9, 0xd3, 0x97, 0xc1, 0xcc, 0x51, 0xf3, 0x04, 0xa4, 0xfd, 0x16, 0xfc, 0xfb, 0x45, 0xfb, + 0x58, 0xb7, 0xdb, 0x4e, 0xeb, 0xba, 0x0f, 0x27, 0x00, 0xa3, 0xbf, 0xfb, 0xaf, 0x55, 0xd4, 0xdc, + 0x9e, 0x0b, 0xbf, 0x44, 0x27, 0x5c, 0xd0, 0x90, 0x32, 0x12, 0x79, 0x12, 0x58, 0x00, 0xc2, 0x23, + 0x41, 0x20, 0x40, 0xca, 0xb2, 0xe7, 0xf1, 0x9a, 0x1e, 0x17, 0xec, 0x6b, 0x4d, 0xe2, 0x67, 0xa8, + 0x25, 0x60, 0x92, 0xb2, 0xc0, 0xf3, 0xa7, 0x84, 0x31, 0x88, 0x3c, 0x1a, 0x14, 0xb7, 0xd0, 0x70, + 0x0f, 0x34, 0xf1, 0x46, 0xe3, 0xc3, 0x00, 0x3f, 0x46, 0xcd, 0x52, 0x9b, 0x70, 0xa1, 0x72, 0xe1, + 0x4e, 0x21, 0xdc, 0xd7, 0xe8, 0x88, 0x0b, 0x35, 0x0c, 0xf0, 0x53, 0x54, 0x1a, 0x3d, 0x09, 0x9f, + 0x52, 0x60, 0x3e, 0x98, 0xbb, 0x1d, 0xa3, 0xb7, 0xeb, 0x96, 0xe6, 0x71, 0x89, 0xe2, 0xe7, 0xf9, + 0xd1, 0x4a, 0x50, 0x90, 0x9e, 0x80, 0x98, 0x50, 0x46, 0x59, 0x68, 0xd6, 0x3a, 0x46, 0xaf, 0xe6, + 0x1e, 0x96, 0x84, 0xbb, 0xc6, 0xb1, 0x89, 0x1e, 0x28, 0x1a, 0x03, 0x4f, 0x95, 0x59, 0x2f, 0xd2, + 0xd6, 0xdb, 0x81, 0x7f, 0xbb, 0xb4, 0x8c, 0xbb, 0xa5, 0x65, 0xfc, 0x5a, 0x5a, 0xc6, 0xb7, 0x95, + 0x55, 0xb9, 0x5b, 0x59, 0x95, 0x1f, 0x2b, 0xab, 0xf2, 0x61, 0xb8, 0x71, 0xed, 0x52, 0x09, 0xc2, + 0x42, 0x88, 0x78, 0x06, 0xfd, 0x0c, 0x98, 0x4a, 0x05, 0x48, 0x47, 0x7f, 0x3a, 0xfd, 0x09, 0x17, + 0x37, 0x44, 0x04, 0xfd, 0x98, 0x06, 0x41, 0x04, 0x37, 0x44, 0x80, 0x93, 0x5d, 0x38, 0xe5, 0xa3, + 0x29, 0xfe, 0x9d, 0xeb, 0x7a, 0xf1, 0x1e, 0x2e, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0xe8, 0x07, + 0x62, 0x7b, 0x4b, 0x03, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -350,11 +359,16 @@ func (m *InFlightPacket) MarshalToSizedBuffer(dAtA []byte) (int, error) { if m.Timeout != 0 { i = encodeVarintGenesis(dAtA, i, uint64(m.Timeout)) i-- - dAtA[i] = 0x28 + dAtA[i] = 0x30 } if m.RetriesRemaining != 0 { i = encodeVarintGenesis(dAtA, i, uint64(m.RetriesRemaining)) i-- + dAtA[i] = 0x28 + } + if m.RefundSequence != 0 { + i = encodeVarintGenesis(dAtA, i, uint64(m.RefundSequence)) + i-- dAtA[i] = 0x20 } if len(m.RefundPortId) > 0 { @@ -441,6 +455,9 @@ func (m *InFlightPacket) Size() (n int) { if l > 0 { n += 1 + l + sovGenesis(uint64(l)) } + if m.RefundSequence != 0 { + n += 1 + sovGenesis(uint64(m.RefundSequence)) + } if m.RetriesRemaining != 0 { n += 1 + sovGenesis(uint64(m.RetriesRemaining)) } @@ -878,6 +895,25 @@ func (m *InFlightPacket) Unmarshal(dAtA []byte) error { m.RefundPortId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field RefundSequence", wireType) + } + m.RefundSequence = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.RefundSequence |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 5: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field RetriesRemaining", wireType) } @@ -896,7 +932,7 @@ func (m *InFlightPacket) Unmarshal(dAtA []byte) error { break } } - case 5: + case 6: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Timeout", wireType) } From 408ba8eabb506ab7e42c08a9ea84445df1f59607 Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Sat, 5 Nov 2022 01:00:22 -0600 Subject: [PATCH 05/24] Move denom unwrapping into function and use for refund --- router/keeper/keeper.go | 34 ++++----------- router/module.go | 95 ++++++++++++++++++++++++++++------------- 2 files changed, 74 insertions(+), 55 deletions(-) diff --git a/router/keeper/keeper.go b/router/keeper/keeper.go index 0cf226b..cde8bae 100644 --- a/router/keeper/keeper.go +++ b/router/keeper/keeper.go @@ -38,10 +38,10 @@ type PacketMetadata struct { } type ForwardMetadata struct { - Receiver string `json:"receiver"` - Port string `json:"port"` - Channel string `json:"channel"` - Timeout time.Duration `json:"timeout"` + Receiver string `json:"receiver,omitempty"` + Port string `json:"port,omitempty"` + Channel string `json:"channel,omitempty"` + Timeout time.Duration `json:"timeout,omitempty"` Retries *uint8 `json:"retries,omitempty"` Next *string `json:"next,omitempty"` RefundSequence *uint64 `json:"refund_sequence,omitempty"` @@ -284,7 +284,7 @@ func (k Keeper) RemoveInFlightPacket(ctx sdk.Context, packet channeltypes.Packet store.Delete(key) } -func (k Keeper) RefundForwardedPacket(ctx sdk.Context, channel string, port string, refundSequence uint64, packetData transfertypes.FungibleTokenPacketData, timeout time.Duration) { +func (k Keeper) RefundForwardedPacket(ctx sdk.Context, channel string, port string, refundSequence uint64, sender string, token sdk.Coin, timeout time.Duration) { store := ctx.KVStore(k.storeKey) key := types.RefundPacketKey(channel, port, refundSequence) if !store.Has(key) { @@ -300,27 +300,11 @@ func (k Keeper) RefundForwardedPacket(ctx sdk.Context, channel string, port stri var inFlightPacket types.InFlightPacket k.cdc.MustUnmarshal(bz, &inFlightPacket) - amount, ok := sdk.NewIntFromString(packetData.Amount) - if !ok { - k.Logger(ctx).Error("packetForwardMiddleware error parsing amount from string for multi-hop refund", - "key", string(key), - "sequence", refundSequence, - "channel-id", channel, - "port-id", port, - "original-sender-address", inFlightPacket.OriginalSenderAddress, - "refund-channel-id", inFlightPacket.RefundChannelId, - "refund-port-id", inFlightPacket.RefundPortId, - "refund-sequence", inFlightPacket.RefundSequence, - "amount", packetData.Amount, - ) - return - } - msgTransfer := transfertypes.NewMsgTransfer( inFlightPacket.RefundPortId, inFlightPacket.RefundChannelId, - sdk.NewCoin(transfertypes.ParseDenomTrace(packetData.Denom).IBCDenom(), amount), - packetData.Sender, + token, + sender, inFlightPacket.OriginalSenderAddress, DefaultTransferPacketTimeoutHeight, uint64(timeout.Nanoseconds())+uint64(ctx.BlockTime().UnixNano()), @@ -343,7 +327,7 @@ func (k Keeper) RefundForwardedPacket(ctx sdk.Context, channel string, port stri "refund-channel-id", inFlightPacket.RefundChannelId, "refund-port-id", inFlightPacket.RefundPortId, "refund-sequence", inFlightPacket.RefundSequence, - "amount", packetData.Amount, + "amount", token.Amount, ) return } @@ -362,7 +346,7 @@ func (k Keeper) RefundForwardedPacket(ctx sdk.Context, channel string, port stri "original-sender-address", inFlightPacket.OriginalSenderAddress, "refund-channel-id", inFlightPacket.RefundChannelId, "refund-port-id", inFlightPacket.RefundPortId, - "amount", packetData.Amount, + "amount", token.Amount, "error", err, ) } diff --git a/router/module.go b/router/module.go index 7f40e0f..8c2bbb5 100644 --- a/router/module.go +++ b/router/module.go @@ -224,6 +224,35 @@ func (am AppModule) OnChanCloseConfirm(ctx sdk.Context, portID, channelID string return am.app.OnChanCloseConfirm(ctx, portID, channelID) } +// NextHopCoin assembles a token with the correct denom for the next hop. +func (am AppModule) NextHopCoin(srcPort, srcChannel, dstPort, dstChannel string, denom string, amount string) (sdk.Coin, error) { + // recalculate denom, skip checks that were already done in app.OnRecvPacket + var denomOut string + if transfertypes.ReceiverChainIsSource(srcPort, srcChannel, denom) { + // remove prefix added by sender chain + voucherPrefix := transfertypes.GetDenomPrefix(srcPort, srcChannel) + unprefixedDenom := denom[len(voucherPrefix):] + + // coin denomination used in sending from the escrow address + denomOut = unprefixedDenom + + // The denomination used to send the coins is either the native denom or the hash of the path + // if the denomination is not native. + denomTrace := transfertypes.ParseDenomTrace(unprefixedDenom) + if denomTrace.Path != "" { + denomOut = denomTrace.IBCDenom() + } + } else { + prefixedDenom := transfertypes.GetDenomPrefix(dstPort, dstChannel) + denom + denomOut = transfertypes.ParseDenomTrace(prefixedDenom).IBCDenom() + } + unit, err := sdk.ParseUint(amount) + if err != nil { + return sdk.Coin{}, err + } + return sdk.NewCoin(denomOut, sdk.NewIntFromUint64(unit.Uint64())), nil +} + // OnRecvPacket implements the IBCModule interface. func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, relayer sdk.AccAddress) ibcexported.Acknowledgement { var data transfertypes.FungibleTokenPacketData @@ -241,9 +270,16 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re metadata := m.Forward if m.Forward.RefundSequence != nil { + if err := am.app.OnRecvPacket(ctx, packet, relayer); err != nil { + return err + } + token, err := am.NextHopCoin(packet.SourcePort, packet.SourceChannel, packet.DestinationPort, packet.DestinationChannel, data.Denom, data.Amount) + if err != nil { + return channeltypes.NewErrorAcknowledgement(err.Error()) + } // pass along refund to previous hop in multi-hop, note that destination channel is used here since it is the OnRecvPacket. - am.keeper.RefundForwardedPacket(ctx, packet.DestinationChannel, packet.DestinationPort, *m.Forward.RefundSequence, data, am.refundTimeout) - return am.app.OnRecvPacket(ctx, packet, relayer) + am.keeper.RefundForwardedPacket(ctx, packet.DestinationChannel, packet.DestinationPort, *m.Forward.RefundSequence, data.Receiver, token, am.refundTimeout) + return nil } if err := metadata.Validate(); err != nil { @@ -252,33 +288,10 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re ack := am.app.OnRecvPacket(ctx, packet, relayer) if ack.Success() { - // recalculate denom, skip checks that were already done in app.OnRecvPacket - var err error - // TODO put denom handling in separate function - var denom string - if transfertypes.ReceiverChainIsSource(packet.GetSourcePort(), packet.GetSourceChannel(), data.Denom) { - // remove prefix added by sender chain - voucherPrefix := transfertypes.GetDenomPrefix(packet.GetSourcePort(), packet.GetSourceChannel()) - unprefixedDenom := data.Denom[len(voucherPrefix):] - - // coin denomination used in sending from the escrow address - denom = unprefixedDenom - - // The denomination used to send the coins is either the native denom or the hash of the path - // if the denomination is not native. - denomTrace := transfertypes.ParseDenomTrace(unprefixedDenom) - if denomTrace.Path != "" { - denom = denomTrace.IBCDenom() - } - } else { - prefixedDenom := transfertypes.GetDenomPrefix(packet.GetDestPort(), packet.GetDestChannel()) + data.Denom - denom = transfertypes.ParseDenomTrace(prefixedDenom).IBCDenom() - } - unit, err := sdk.ParseUint(data.Amount) + token, err := am.NextHopCoin(packet.SourcePort, packet.SourceChannel, packet.DestinationPort, packet.DestinationChannel, data.Denom, data.Amount) if err != nil { - channeltypes.NewErrorAcknowledgement(err.Error()) + return channeltypes.NewErrorAcknowledgement(err.Error()) } - var token = sdk.NewCoin(denom, sdk.NewIntFromUint64(unit.Uint64())) var timeout time.Duration if metadata.Timeout.Nanoseconds() > 0 { @@ -296,7 +309,7 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re err = am.keeper.ForwardTransferPacket(ctx, nil, packet, data.Sender, data.Receiver, metadata, token, retries, timeout, []metrics.Label{}) if err != nil { - am.keeper.RefundForwardedPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence, data, am.refundTimeout) + am.keeper.RefundForwardedPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence, data.Receiver, token, am.refundTimeout) ack = channeltypes.NewErrorAcknowledgement(err.Error()) } } @@ -328,7 +341,18 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes return nil } - am.keeper.RefundForwardedPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence, data, am.refundTimeout) + token, err := am.NextHopCoin(packet.SourcePort, packet.SourceChannel, packet.DestinationPort, packet.DestinationChannel, data.Denom, data.Amount) + if err != nil { + am.keeper.Logger(ctx).Error("packetForwardMiddleware error getting next hop coin for refund on ack", + "sequence", packet.Sequence, + "channel-id", packet.SourceChannel, + "port-id", packet.SourcePort, + "error", err, + ) + return nil + } + + am.keeper.RefundForwardedPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence, data.Sender, token, am.refundTimeout) return nil } @@ -355,7 +379,18 @@ func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, return nil } - am.keeper.RefundForwardedPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence, data, am.refundTimeout) + token, err := am.NextHopCoin(packet.SourcePort, packet.SourceChannel, packet.DestinationPort, packet.DestinationChannel, data.Denom, data.Amount) + if err != nil { + am.keeper.Logger(ctx).Error("packetForwardMiddleware error getting next hop coin for refund on timeout", + "sequence", packet.Sequence, + "channel-id", packet.SourceChannel, + "port-id", packet.SourcePort, + "error", err, + ) + return nil + } + + am.keeper.RefundForwardedPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence, data.Sender, token, am.refundTimeout) } return nil From 4534515e9990a6be9054f49850645c3ab6a0d2d1 Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Sat, 5 Nov 2022 01:35:54 -0600 Subject: [PATCH 06/24] Flip order of src/dst for ack/timeout refunds --- router/module.go | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/router/module.go b/router/module.go index 8c2bbb5..555e6b0 100644 --- a/router/module.go +++ b/router/module.go @@ -225,10 +225,16 @@ func (am AppModule) OnChanCloseConfirm(ctx sdk.Context, portID, channelID string } // NextHopCoin assembles a token with the correct denom for the next hop. -func (am AppModule) NextHopCoin(srcPort, srcChannel, dstPort, dstChannel string, denom string, amount string) (sdk.Coin, error) { +func (am AppModule) NextHopCoin(ctx sdk.Context, srcPort, srcChannel, dstPort, dstChannel, denom, amount string) (sdk.Coin, error) { // recalculate denom, skip checks that were already done in app.OnRecvPacket var denomOut string + if transfertypes.ReceiverChainIsSource(srcPort, srcChannel, denom) { + am.keeper.Logger(ctx).Debug("packetForwardMiddleware NextHopCoin receiver chain is source", + "src_port", srcPort, "src_channel", srcChannel, + "dst_port", dstPort, "dst_channel", dstChannel, + "denom", denom, "amount", amount, + ) // remove prefix added by sender chain voucherPrefix := transfertypes.GetDenomPrefix(srcPort, srcChannel) unprefixedDenom := denom[len(voucherPrefix):] @@ -243,6 +249,11 @@ func (am AppModule) NextHopCoin(srcPort, srcChannel, dstPort, dstChannel string, denomOut = denomTrace.IBCDenom() } } else { + am.keeper.Logger(ctx).Debug("packetForwardMiddleware NextHopCoin sender chain is source", + "src_port", srcPort, "src_channel", srcChannel, + "dst_port", dstPort, "dst_channel", dstChannel, + "denom", denom, "amount", amount, + ) prefixedDenom := transfertypes.GetDenomPrefix(dstPort, dstChannel) + denom denomOut = transfertypes.ParseDenomTrace(prefixedDenom).IBCDenom() } @@ -273,7 +284,7 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re if err := am.app.OnRecvPacket(ctx, packet, relayer); err != nil { return err } - token, err := am.NextHopCoin(packet.SourcePort, packet.SourceChannel, packet.DestinationPort, packet.DestinationChannel, data.Denom, data.Amount) + token, err := am.NextHopCoin(ctx, packet.SourcePort, packet.SourceChannel, packet.DestinationPort, packet.DestinationChannel, data.Denom, data.Amount) if err != nil { return channeltypes.NewErrorAcknowledgement(err.Error()) } @@ -288,7 +299,7 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re ack := am.app.OnRecvPacket(ctx, packet, relayer) if ack.Success() { - token, err := am.NextHopCoin(packet.SourcePort, packet.SourceChannel, packet.DestinationPort, packet.DestinationChannel, data.Denom, data.Amount) + token, err := am.NextHopCoin(ctx, packet.SourcePort, packet.SourceChannel, packet.DestinationPort, packet.DestinationChannel, data.Denom, data.Amount) if err != nil { return channeltypes.NewErrorAcknowledgement(err.Error()) } @@ -341,7 +352,7 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes return nil } - token, err := am.NextHopCoin(packet.SourcePort, packet.SourceChannel, packet.DestinationPort, packet.DestinationChannel, data.Denom, data.Amount) + token, err := am.NextHopCoin(ctx, packet.DestinationPort, packet.DestinationChannel, packet.SourcePort, packet.SourceChannel, data.Denom, data.Amount) if err != nil { am.keeper.Logger(ctx).Error("packetForwardMiddleware error getting next hop coin for refund on ack", "sequence", packet.Sequence, @@ -379,7 +390,7 @@ func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, return nil } - token, err := am.NextHopCoin(packet.SourcePort, packet.SourceChannel, packet.DestinationPort, packet.DestinationChannel, data.Denom, data.Amount) + token, err := am.NextHopCoin(ctx, packet.DestinationPort, packet.DestinationChannel, packet.SourcePort, packet.SourceChannel, data.Denom, data.Amount) if err != nil { am.keeper.Logger(ctx).Error("packetForwardMiddleware error getting next hop coin for refund on timeout", "sequence", packet.Sequence, From 7ee6fbfcdd20459ac8fec06feb3ddb97b08dd08d Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Sat, 5 Nov 2022 02:05:17 -0600 Subject: [PATCH 07/24] Don't unwrap tokens for timeout/ack case --- router/module.go | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/router/module.go b/router/module.go index 555e6b0..dc132f1 100644 --- a/router/module.go +++ b/router/module.go @@ -352,17 +352,19 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes return nil } - token, err := am.NextHopCoin(ctx, packet.DestinationPort, packet.DestinationChannel, packet.SourcePort, packet.SourceChannel, data.Denom, data.Amount) - if err != nil { - am.keeper.Logger(ctx).Error("packetForwardMiddleware error getting next hop coin for refund on ack", + amount, ok := sdk.NewIntFromString(data.Amount) + if !ok { + am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing amount from string for refund on timeout", "sequence", packet.Sequence, "channel-id", packet.SourceChannel, "port-id", packet.SourcePort, - "error", err, + "amount", data.Amount, ) return nil } + token := sdk.NewCoin(transfertypes.ParseDenomTrace(data.Denom).IBCDenom(), amount) + am.keeper.RefundForwardedPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence, data.Sender, token, am.refundTimeout) return nil } @@ -390,17 +392,19 @@ func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, return nil } - token, err := am.NextHopCoin(ctx, packet.DestinationPort, packet.DestinationChannel, packet.SourcePort, packet.SourceChannel, data.Denom, data.Amount) - if err != nil { - am.keeper.Logger(ctx).Error("packetForwardMiddleware error getting next hop coin for refund on timeout", + amount, ok := sdk.NewIntFromString(data.Amount) + if !ok { + am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing amount from string for refund on timeout", "sequence", packet.Sequence, "channel-id", packet.SourceChannel, "port-id", packet.SourcePort, - "error", err, + "amount", data.Amount, ) return nil } + token := sdk.NewCoin(transfertypes.ParseDenomTrace(data.Denom).IBCDenom(), amount) + am.keeper.RefundForwardedPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence, data.Sender, token, am.refundTimeout) } From 0d15481ee5d9e837752d1704f11a4bf0c795227b Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Sat, 5 Nov 2022 14:38:43 -0600 Subject: [PATCH 08/24] Break out inFlightPacket fetching from RefundForwardedPacket for clarity --- router/keeper/keeper.go | 76 ++++++++++++++++++++++--------- router/module.go | 99 ++++++++++++++++++++++++++++------------- 2 files changed, 122 insertions(+), 53 deletions(-) diff --git a/router/keeper/keeper.go b/router/keeper/keeper.go index cde8bae..6c58a5a 100644 --- a/router/keeper/keeper.go +++ b/router/keeper/keeper.go @@ -284,12 +284,18 @@ func (k Keeper) RemoveInFlightPacket(ctx sdk.Context, packet channeltypes.Packet store.Delete(key) } -func (k Keeper) RefundForwardedPacket(ctx sdk.Context, channel string, port string, refundSequence uint64, sender string, token sdk.Coin, timeout time.Duration) { +// GetAndClearInFlightPacket will fetch an InFlightPacket from the store, remove it if it exists, and return it. +func (k Keeper) GetAndClearInFlightPacket( + ctx sdk.Context, + channel string, + port string, + sequence uint64, +) *types.InFlightPacket { store := ctx.KVStore(k.storeKey) - key := types.RefundPacketKey(channel, port, refundSequence) + key := types.RefundPacketKey(channel, port, sequence) if !store.Has(key) { // this is either not a forwarded packet, or it is the final destination for the refund. - return + return nil } bz := store.Get(key) @@ -299,35 +305,65 @@ func (k Keeper) RefundForwardedPacket(ctx sdk.Context, channel string, port stri var inFlightPacket types.InFlightPacket k.cdc.MustUnmarshal(bz, &inFlightPacket) + return &inFlightPacket +} + +func (k Keeper) RefundForwardedPacket( + ctx sdk.Context, + channel string, + port string, + refundSequence uint64, + sender string, + receiver string, + token sdk.Coin, + timeout time.Duration, +) { + feeAmount := sdk.NewDecFromInt(token.Amount).Mul(k.GetFeePercentage(ctx)).RoundInt() + packetAmount := token.Amount.Sub(feeAmount) + feeCoins := sdk.Coins{sdk.NewCoin(token.Denom, feeAmount)} + packetCoin := sdk.NewCoin(token.Denom, packetAmount) + + // pay fees + if feeAmount.IsPositive() { + hostAccAddr, err := sdk.AccAddressFromBech32(receiver) + if err != nil { + return + } + err = k.distrKeeper.FundCommunityPool(ctx, feeCoins, hostAccAddr) + if err != nil { + k.Logger(ctx).Error("packetForwardMiddleware error funding community pool", + "error", err, + ) + return + } + } msgTransfer := transfertypes.NewMsgTransfer( - inFlightPacket.RefundPortId, - inFlightPacket.RefundChannelId, - token, + port, + channel, + packetCoin, sender, - inFlightPacket.OriginalSenderAddress, + receiver, DefaultTransferPacketTimeoutHeight, - uint64(timeout.Nanoseconds())+uint64(ctx.BlockTime().UnixNano()), + uint64(ctx.BlockTime().UnixNano())+uint64(timeout.Nanoseconds()), ) packetMemo := &PacketMetadata{ Forward: &ForwardMetadata{ - RefundSequence: &inFlightPacket.RefundSequence, + RefundSequence: &refundSequence, }, } memo, err := json.Marshal(packetMemo) if err != nil { k.Logger(ctx).Error("packetForwardMiddleware error marshaling json for multi-hop refund sequence", - "key", string(key), - "sequence", refundSequence, "channel-id", channel, "port-id", port, - "original-sender-address", inFlightPacket.OriginalSenderAddress, - "refund-channel-id", inFlightPacket.RefundChannelId, - "refund-port-id", inFlightPacket.RefundPortId, - "refund-sequence", inFlightPacket.RefundSequence, + "sender", sender, + "receiver", receiver, + "refund-sequence", refundSequence, "amount", token.Amount, + "denom", token.Denom, ) return } @@ -339,15 +375,13 @@ func (k Keeper) RefundForwardedPacket(ctx sdk.Context, channel string, port stri msgTransfer, ); err != nil { k.Logger(ctx).Error("packetForwardMiddleware error sending packet transfer for multi-hop refund", - "key", string(key), - "sequence", refundSequence, "channel-id", channel, "port-id", port, - "original-sender-address", inFlightPacket.OriginalSenderAddress, - "refund-channel-id", inFlightPacket.RefundChannelId, - "refund-port-id", inFlightPacket.RefundPortId, + "sender", sender, + "receiver", receiver, + "refund-sequence", refundSequence, "amount", token.Amount, - "error", err, + "denom", token.Denom, ) } } diff --git a/router/module.go b/router/module.go index dc132f1..b46a6ac 100644 --- a/router/module.go +++ b/router/module.go @@ -281,15 +281,23 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re metadata := m.Forward if m.Forward.RefundSequence != nil { - if err := am.app.OnRecvPacket(ctx, packet, relayer); err != nil { - return err + ack := am.app.OnRecvPacket(ctx, packet, relayer) + if !ack.Success() { + return ack } + + inFlightPacket := am.keeper.GetAndClearInFlightPacket(ctx, packet.DestinationChannel, packet.DestinationPort, *m.Forward.RefundSequence) + if inFlightPacket == nil { + // this is either not a forwarded packet, or it is the final destination for the refund. + return nil + } + token, err := am.NextHopCoin(ctx, packet.SourcePort, packet.SourceChannel, packet.DestinationPort, packet.DestinationChannel, data.Denom, data.Amount) if err != nil { return channeltypes.NewErrorAcknowledgement(err.Error()) } - // pass along refund to previous hop in multi-hop, note that destination channel is used here since it is the OnRecvPacket. - am.keeper.RefundForwardedPacket(ctx, packet.DestinationChannel, packet.DestinationPort, *m.Forward.RefundSequence, data.Receiver, token, am.refundTimeout) + // pass along refund to previous hop in multi-hop. + am.keeper.RefundForwardedPacket(ctx, inFlightPacket.RefundChannelId, inFlightPacket.RefundPortId, inFlightPacket.RefundSequence, data.Receiver, inFlightPacket.OriginalSenderAddress, token, am.refundTimeout) return nil } @@ -298,31 +306,34 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re } ack := am.app.OnRecvPacket(ctx, packet, relayer) - if ack.Success() { - token, err := am.NextHopCoin(ctx, packet.SourcePort, packet.SourceChannel, packet.DestinationPort, packet.DestinationChannel, data.Denom, data.Amount) - if err != nil { - return channeltypes.NewErrorAcknowledgement(err.Error()) - } + if !ack.Success() { + return ack + } - var timeout time.Duration - if metadata.Timeout.Nanoseconds() > 0 { - timeout = metadata.Timeout - } else { - timeout = am.forwardTimeout - } + token, err := am.NextHopCoin(ctx, packet.SourcePort, packet.SourceChannel, packet.DestinationPort, packet.DestinationChannel, data.Denom, data.Amount) + if err != nil { + return channeltypes.NewErrorAcknowledgement(err.Error()) + } - var retries uint8 - if metadata.Retries != nil { - retries = *metadata.Retries - } else { - retries = am.retriesOnTimeout - } + var timeout time.Duration + if metadata.Timeout.Nanoseconds() > 0 { + timeout = metadata.Timeout + } else { + timeout = am.forwardTimeout + } - err = am.keeper.ForwardTransferPacket(ctx, nil, packet, data.Sender, data.Receiver, metadata, token, retries, timeout, []metrics.Label{}) - if err != nil { - am.keeper.RefundForwardedPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence, data.Receiver, token, am.refundTimeout) - ack = channeltypes.NewErrorAcknowledgement(err.Error()) - } + var retries uint8 + if metadata.Retries != nil { + retries = *metadata.Retries + } else { + retries = am.retriesOnTimeout + } + + err = am.keeper.ForwardTransferPacket(ctx, nil, packet, data.Sender, data.Receiver, metadata, token, retries, timeout, []metrics.Label{}) + if err != nil { + // Don't think this is needed since ack error will issue refund on previous chain. + // am.keeper.RefundForwardedPacket(ctx, packet.DestinationChannel, packet.DestinationPort, packet.Sequence, data.Receiver, data.Sender, token, am.refundTimeout) + ack = channeltypes.NewErrorAcknowledgement(err.Error()) } return ack } @@ -340,6 +351,10 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes if !ack.Success() { // If acknowledgement indicates error, no retries should be attempted. Refund will be initiated now. + inFlightPacket := am.keeper.GetAndClearInFlightPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence) + if inFlightPacket == nil { + return nil + } var data transfertypes.FungibleTokenPacketData if err := transfertypes.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { @@ -363,9 +378,16 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes return nil } - token := sdk.NewCoin(transfertypes.ParseDenomTrace(data.Denom).IBCDenom(), amount) - - am.keeper.RefundForwardedPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence, data.Sender, token, am.refundTimeout) + am.keeper.RefundForwardedPacket( + ctx, + inFlightPacket.RefundChannelId, + inFlightPacket.RefundPortId, + inFlightPacket.RefundSequence, + data.Sender, + inFlightPacket.OriginalSenderAddress, + sdk.NewCoin(transfertypes.ParseDenomTrace(data.Denom).IBCDenom(), amount), + am.refundTimeout, + ) return nil } @@ -381,6 +403,11 @@ func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, } if err := am.keeper.HandleTimeout(ctx, packet); err != nil { + inFlightPacket := am.keeper.GetAndClearInFlightPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence) + if inFlightPacket == nil { + return nil + } + var data transfertypes.FungibleTokenPacketData if err := transfertypes.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing packet data from timeout for refund", @@ -403,9 +430,17 @@ func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, return nil } - token := sdk.NewCoin(transfertypes.ParseDenomTrace(data.Denom).IBCDenom(), amount) - - am.keeper.RefundForwardedPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence, data.Sender, token, am.refundTimeout) + am.keeper.RefundForwardedPacket( + ctx, + inFlightPacket.RefundChannelId, + inFlightPacket.RefundPortId, + inFlightPacket.RefundSequence, + data.Sender, + inFlightPacket.OriginalSenderAddress, + sdk.NewCoin(transfertypes.ParseDenomTrace(data.Denom).IBCDenom(), amount), + am.refundTimeout, + ) + return nil } return nil From c6c4ae884228529187e92fc88c3d929ca66c1fbc Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Sat, 5 Nov 2022 15:21:26 -0600 Subject: [PATCH 09/24] Add debug logs --- router/keeper/keeper.go | 35 +++++++++------ router/module.go | 97 ++++++++++++++++++++++++++++++----------- 2 files changed, 94 insertions(+), 38 deletions(-) diff --git a/router/keeper/keeper.go b/router/keeper/keeper.go index 6c58a5a..64871fc 100644 --- a/router/keeper/keeper.go +++ b/router/keeper/keeper.go @@ -148,20 +148,23 @@ func (k Keeper) ForwardTransferPacket( msgTransfer.Memo = *metadata.Next } + k.Logger(ctx).Debug("packetForwardMiddleware ForwardTransferPacket", + "port", metadata.Port, "channel", metadata.Channel, + "sender", receiver, "receiver", metadata.Receiver, + "amount", packetCoin.Amount.String(), "denom", packetCoin.Denom, + ) + // send tokens to destination res, err := k.transferKeeper.Transfer( sdk.WrapSDKContext(ctx), msgTransfer, ) if err != nil { - k.Logger(ctx).Error("packetForwardMiddleware SendPacketTransfer error", + k.Logger(ctx).Error("packetForwardMiddleware ForwardTransferPacket error", + "port", metadata.Port, "channel", metadata.Channel, + "sender", receiver, "receiver", metadata.Receiver, + "amount", packetCoin.Amount.String(), "denom", packetCoin.Denom, "error", err, - "amount", packetCoin.Amount.String(), - "denom", packetCoin.Denom, - "sender", receiver, - "receiver", metadata.Receiver, - "port", metadata.Port, - "channel", metadata.Channel, ) return sdkerrors.Wrapf(sdkerrors.ErrInsufficientFunds, err.Error()) } @@ -357,19 +360,24 @@ func (k Keeper) RefundForwardedPacket( memo, err := json.Marshal(packetMemo) if err != nil { k.Logger(ctx).Error("packetForwardMiddleware error marshaling json for multi-hop refund sequence", - "channel-id", channel, - "port-id", port, - "sender", sender, - "receiver", receiver, "refund-sequence", refundSequence, - "amount", token.Amount, - "denom", token.Denom, + "channel-id", channel, "port-id", port, + "sender", sender, "receiver", receiver, + "amount", packetCoin.Amount, "denom", packetCoin.Denom, + "error", err, ) return } msgTransfer.Memo = string(memo) + k.Logger(ctx).Debug("packetForwardMiddleware RefundForwardedPacket", + "refund-sequence", refundSequence, + "channel-id", channel, "port-id", port, + "sender", sender, "receiver", receiver, + "amount", packetCoin.Amount, "denom", packetCoin.Denom, + ) + if _, err := k.transferKeeper.Transfer( sdk.WrapSDKContext(ctx), msgTransfer, @@ -382,6 +390,7 @@ func (k Keeper) RefundForwardedPacket( "refund-sequence", refundSequence, "amount", token.Amount, "denom", token.Denom, + "error", err, ) } } diff --git a/router/module.go b/router/module.go index b46a6ac..9528ea1 100644 --- a/router/module.go +++ b/router/module.go @@ -271,6 +271,13 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re return channeltypes.NewErrorAcknowledgement(err.Error()) } + am.keeper.Logger(ctx).Debug("packetForwardMiddleware OnRecvPacket", + "sequence", packet.Sequence, + "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, + "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, + "amount", data.Amount, "denom", data.Denom, + ) + m := &keeper.PacketMetadata{} err := json.Unmarshal([]byte(data.Memo), m) if err != nil || m.Forward == nil { @@ -340,6 +347,25 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re // OnAcknowledgementPacket implements the IBCModule interface func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes.Packet, acknowledgement []byte, relayer sdk.AccAddress) error { + // TODO only need to do unmarshalling in !ack.Success() branch below. Using this only for debug log. + var data transfertypes.FungibleTokenPacketData + if err := transfertypes.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { + am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing packet data from ack packet", + "sequence", packet.Sequence, + "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, + "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, + "error", err, + ) + return am.app.OnAcknowledgementPacket(ctx, packet, acknowledgement, relayer) + } + + am.keeper.Logger(ctx).Debug("packetForwardMiddleware OnAcknowledgementPacket", + "sequence", packet.Sequence, + "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, + "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, + "amount", data.Amount, "denom", data.Denom, + ) + if err := am.app.OnAcknowledgementPacket(ctx, packet, acknowledgement, relayer); err != nil { return err } @@ -356,23 +382,24 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes return nil } - var data transfertypes.FungibleTokenPacketData - if err := transfertypes.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { - am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing packet data from ack for refund", - "sequence", packet.Sequence, - "channel-id", packet.SourceChannel, - "port-id", packet.SourcePort, - "error", err, - ) - return nil - } + // TODO uncomment this once debug log removed above. + // var data transfertypes.FungibleTokenPacketData + // if err := transfertypes.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { + // am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing packet data from ack for refund", + // "sequence", packet.Sequence, + // "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, + // "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, + // "error", err, + // ) + // return nil + // } amount, ok := sdk.NewIntFromString(data.Amount) if !ok { - am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing amount from string for refund on timeout", + am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing amount from string for refund on ack", "sequence", packet.Sequence, - "channel-id", packet.SourceChannel, - "port-id", packet.SourcePort, + "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, + "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, "amount", data.Amount, ) return nil @@ -398,6 +425,25 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes // OnTimeoutPacket implements the IBCModule interface func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, relayer sdk.AccAddress) error { + // TODO only need to do unmarshalling in HandleTimeout error branch below. Using this only for debug log. + var data transfertypes.FungibleTokenPacketData + if err := transfertypes.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { + am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing packet data from timeout packet", + "sequence", packet.Sequence, + "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, + "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, + "error", err, + ) + return am.app.OnTimeoutPacket(ctx, packet, relayer) + } + + am.keeper.Logger(ctx).Debug("packetForwardMiddleware OnAcknowledgementPacket", + "sequence", packet.Sequence, + "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, + "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, + "amount", data.Amount, "denom", data.Denom, + ) + if err := am.app.OnTimeoutPacket(ctx, packet, relayer); err != nil { return err } @@ -408,23 +454,24 @@ func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, return nil } - var data transfertypes.FungibleTokenPacketData - if err := transfertypes.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { - am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing packet data from timeout for refund", - "sequence", packet.Sequence, - "channel-id", packet.SourceChannel, - "port-id", packet.SourcePort, - "error", err, - ) - return nil - } + // TODO uncomment this once debug log removed above. + // var data transfertypes.FungibleTokenPacketData + // if err := transfertypes.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { + // am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing packet data from timeout for refund", + // "sequence", packet.Sequence, + // "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, + // "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, + // "error", err, + // ) + // return nil + // } amount, ok := sdk.NewIntFromString(data.Amount) if !ok { am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing amount from string for refund on timeout", "sequence", packet.Sequence, - "channel-id", packet.SourceChannel, - "port-id", packet.SourcePort, + "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, + "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, "amount", data.Amount, ) return nil From 2e823d9145cff082f83f783f9b3b2e7d6eacaca7 Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Sat, 5 Nov 2022 16:17:55 -0600 Subject: [PATCH 10/24] Add RefundDenom to InFlightPacket --- proto/router/v1/genesis.proto | 14 ++-- router/keeper/keeper.go | 17 ++++- router/module.go | 18 ++++- router/types/genesis.pb.go | 140 ++++++++++++++++++++++++---------- 4 files changed, 138 insertions(+), 51 deletions(-) diff --git a/proto/router/v1/genesis.proto b/proto/router/v1/genesis.proto index 3966884..b8416a3 100644 --- a/proto/router/v1/genesis.proto +++ b/proto/router/v1/genesis.proto @@ -10,8 +10,10 @@ import "gogoproto/gogo.proto"; message GenesisState { Params params = 1 [ (gogoproto.nullable) = false ]; - // key - information about forwarded packet: src_channel (parsedReceiver.Channel), src_port (parsedReceiver.Port), sequence - // value - information about original packet for refunding if necessary: retries, srcPacketSender, srcPacket.DestinationChannel, srcPacket.DestinationPort + // key - information about forwarded packet: src_channel + // (parsedReceiver.Channel), src_port (parsedReceiver.Port), sequence value - + // information about original packet for refunding if necessary: retries, + // srcPacketSender, srcPacket.DestinationChannel, srcPacket.DestinationPort map in_flight_packets = 2 [ (gogoproto.moretags) = "yaml:\"in_flight_packets\"", (gogoproto.nullable) = false @@ -27,12 +29,14 @@ message Params { ]; } -// InFlightPacket contains information about original packet for refunding if necessary. +// InFlightPacket contains information about original packet for refunding if +// necessary. message InFlightPacket { string original_sender_address = 1; string refund_channel_id = 2; string refund_port_id = 3; uint64 refund_sequence = 4; - int32 retries_remaining = 5; - uint64 timeout = 6; + string refund_denom = 5; + int32 retries_remaining = 6; + uint64 timeout = 7; } \ No newline at end of file diff --git a/router/keeper/keeper.go b/router/keeper/keeper.go index 64871fc..bdb0090 100644 --- a/router/keeper/keeper.go +++ b/router/keeper/keeper.go @@ -108,6 +108,7 @@ func (k Keeper) ForwardTransferPacket( receiver string, metadata *ForwardMetadata, token sdk.Coin, + refundDenom string, maxRetries uint8, timeout time.Duration, labels []metrics.Label, @@ -179,6 +180,7 @@ func (k Keeper) ForwardTransferPacket( RefundChannelId: srcPacket.DestinationChannel, RefundPortId: srcPacket.DestinationPort, RefundSequence: srcPacket.Sequence, + RefundDenom: refundDenom, RetriesRemaining: int32(maxRetries), Timeout: uint64(timeout.Nanoseconds()), } @@ -272,7 +274,20 @@ func (k Keeper) HandleTimeout( var token = sdk.NewCoin(denom, amount) - return k.ForwardTransferPacket(ctx, &inFlightPacket, channeltypes.Packet{}, "", data.Sender, metadata, token, uint8(inFlightPacket.RetriesRemaining), time.Duration(inFlightPacket.Timeout)*time.Nanosecond, nil) + // srcPacket, srcPacketSender, and refundDenom are empty because inFlightPacket is non-nil. + return k.ForwardTransferPacket( + ctx, + &inFlightPacket, + channeltypes.Packet{}, + "", + data.Sender, + metadata, + token, + "", + uint8(inFlightPacket.RetriesRemaining), + time.Duration(inFlightPacket.Timeout)*time.Nanosecond, + nil, + ) } func (k Keeper) RemoveInFlightPacket(ctx sdk.Context, packet channeltypes.Packet) { diff --git a/router/module.go b/router/module.go index 9528ea1..61d61d7 100644 --- a/router/module.go +++ b/router/module.go @@ -299,10 +299,20 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re return nil } - token, err := am.NextHopCoin(ctx, packet.SourcePort, packet.SourceChannel, packet.DestinationPort, packet.DestinationChannel, data.Denom, data.Amount) - if err != nil { - return channeltypes.NewErrorAcknowledgement(err.Error()) + amount, ok := sdk.NewIntFromString(data.Amount) + if !ok { + am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing amount from string for multi-hop refund", + "sequence", packet.Sequence, + "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, + "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, + "amount", data.Amount, "denom", data.Denom, + "error", err, + ) + return nil } + // TODO can we unwrap denom instead of requiring RefundDenom to be stored on InFlightPacket? + token := sdk.NewCoin(inFlightPacket.RefundDenom, amount) + // pass along refund to previous hop in multi-hop. am.keeper.RefundForwardedPacket(ctx, inFlightPacket.RefundChannelId, inFlightPacket.RefundPortId, inFlightPacket.RefundSequence, data.Receiver, inFlightPacket.OriginalSenderAddress, token, am.refundTimeout) return nil @@ -336,7 +346,7 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re retries = am.retriesOnTimeout } - err = am.keeper.ForwardTransferPacket(ctx, nil, packet, data.Sender, data.Receiver, metadata, token, retries, timeout, []metrics.Label{}) + err = am.keeper.ForwardTransferPacket(ctx, nil, packet, data.Sender, data.Receiver, metadata, token, data.Denom, retries, timeout, []metrics.Label{}) if err != nil { // Don't think this is needed since ack error will issue refund on previous chain. // am.keeper.RefundForwardedPacket(ctx, packet.DestinationChannel, packet.DestinationPort, packet.Sequence, data.Receiver, data.Sender, token, am.refundTimeout) diff --git a/router/types/genesis.pb.go b/router/types/genesis.pb.go index f9374d9..df6a0c3 100644 --- a/router/types/genesis.pb.go +++ b/router/types/genesis.pb.go @@ -26,7 +26,11 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // GenesisState defines the router genesis state type GenesisState struct { - Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` + Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` + // key - information about forwarded packet: src_channel + // (parsedReceiver.Channel), src_port (parsedReceiver.Port), sequence value - + // information about original packet for refunding if necessary: retries, + // srcPacketSender, srcPacket.DestinationChannel, srcPacket.DestinationPort InFlightPackets map[string]InFlightPacket `protobuf:"bytes,2,rep,name=in_flight_packets,json=inFlightPackets,proto3" json:"in_flight_packets" yaml:"in_flight_packets" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } @@ -115,13 +119,16 @@ func (m *Params) XXX_DiscardUnknown() { var xxx_messageInfo_Params proto.InternalMessageInfo +// InFlightPacket contains information about original packet for refunding if +// necessary. type InFlightPacket struct { OriginalSenderAddress string `protobuf:"bytes,1,opt,name=original_sender_address,json=originalSenderAddress,proto3" json:"original_sender_address,omitempty"` RefundChannelId string `protobuf:"bytes,2,opt,name=refund_channel_id,json=refundChannelId,proto3" json:"refund_channel_id,omitempty"` RefundPortId string `protobuf:"bytes,3,opt,name=refund_port_id,json=refundPortId,proto3" json:"refund_port_id,omitempty"` RefundSequence uint64 `protobuf:"varint,4,opt,name=refund_sequence,json=refundSequence,proto3" json:"refund_sequence,omitempty"` - RetriesRemaining int32 `protobuf:"varint,5,opt,name=retries_remaining,json=retriesRemaining,proto3" json:"retries_remaining,omitempty"` - Timeout uint64 `protobuf:"varint,6,opt,name=timeout,proto3" json:"timeout,omitempty"` + RefundDenom string `protobuf:"bytes,5,opt,name=refund_denom,json=refundDenom,proto3" json:"refund_denom,omitempty"` + RetriesRemaining int32 `protobuf:"varint,6,opt,name=retries_remaining,json=retriesRemaining,proto3" json:"retries_remaining,omitempty"` + Timeout uint64 `protobuf:"varint,7,opt,name=timeout,proto3" json:"timeout,omitempty"` } func (m *InFlightPacket) Reset() { *m = InFlightPacket{} } @@ -185,6 +192,13 @@ func (m *InFlightPacket) GetRefundSequence() uint64 { return 0 } +func (m *InFlightPacket) GetRefundDenom() string { + if m != nil { + return m.RefundDenom + } + return "" +} + func (m *InFlightPacket) GetRetriesRemaining() int32 { if m != nil { return m.RetriesRemaining @@ -209,41 +223,42 @@ func init() { func init() { proto.RegisterFile("router/v1/genesis.proto", fileDescriptor_4940b763c55c4e0b) } var fileDescriptor_4940b763c55c4e0b = []byte{ - // 534 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0xcd, 0x6e, 0xd3, 0x30, - 0x1c, 0x6f, 0xba, 0xb5, 0xa8, 0xde, 0xe8, 0x56, 0x6b, 0xd3, 0xc2, 0x0e, 0x69, 0x55, 0x21, 0xa8, - 0x80, 0x26, 0xda, 0x26, 0x21, 0xb4, 0x1b, 0xe5, 0x63, 0xea, 0xad, 0x4a, 0x6f, 0x48, 0x28, 0xf2, - 0x92, 0x7f, 0x53, 0xab, 0x89, 0x1d, 0x6c, 0x27, 0xa3, 0x3c, 0x02, 0x27, 0xce, 0x3c, 0xd1, 0x8e, - 0x3b, 0x22, 0x0e, 0x15, 0x6a, 0xdf, 0x60, 0x4f, 0x80, 0x12, 0xa7, 0xd0, 0x0a, 0x4e, 0xb5, 0x7f, - 0x5f, 0xfe, 0xff, 0xdc, 0x18, 0x9d, 0x08, 0x9e, 0x2a, 0x10, 0x4e, 0x76, 0xe6, 0x84, 0xc0, 0x40, - 0x52, 0x69, 0x27, 0x82, 0x2b, 0x8e, 0x1b, 0x9a, 0xb0, 0xb3, 0xb3, 0xd3, 0xa3, 0x90, 0x87, 0xbc, - 0x40, 0x9d, 0x7c, 0xa5, 0x05, 0xdd, 0xef, 0x55, 0xb4, 0x7f, 0xa5, 0x2d, 0x63, 0x45, 0x14, 0x60, - 0x07, 0xd5, 0x13, 0x22, 0x48, 0x2c, 0x4d, 0xa3, 0x63, 0xf4, 0xf6, 0xce, 0x5b, 0xf6, 0x9f, 0x08, - 0x7b, 0x54, 0x10, 0x83, 0xdd, 0xdb, 0x45, 0xbb, 0xe2, 0x96, 0x32, 0xfc, 0x05, 0xb5, 0x28, 0xf3, - 0x26, 0x11, 0x0d, 0xa7, 0xca, 0x4b, 0x88, 0x3f, 0x03, 0x25, 0xcd, 0x6a, 0x67, 0xa7, 0xb7, 0x77, - 0xfe, 0x62, 0xc3, 0xbb, 0x79, 0x88, 0x3d, 0x64, 0xef, 0x0b, 0xfd, 0x48, 0xcb, 0xdf, 0x31, 0x25, - 0xe6, 0x83, 0x4e, 0x1e, 0x7b, 0xbf, 0x68, 0x9b, 0x73, 0x12, 0x47, 0x97, 0xdd, 0x7f, 0x42, 0xbb, - 0xee, 0x01, 0xdd, 0xf6, 0x9d, 0x7e, 0x44, 0x47, 0xff, 0x8b, 0xc2, 0x87, 0x68, 0x67, 0x06, 0xf3, - 0xa2, 0x41, 0xc3, 0xcd, 0x97, 0xd8, 0x41, 0xb5, 0x8c, 0x44, 0x29, 0x98, 0xd5, 0xa2, 0xd5, 0xa3, - 0x8d, 0xc9, 0xb6, 0x13, 0x5c, 0xad, 0xbb, 0xac, 0xbe, 0x32, 0xba, 0x9f, 0x51, 0x5d, 0x57, 0xc6, - 0x0c, 0x35, 0x27, 0x00, 0x5e, 0x02, 0xc2, 0x07, 0xa6, 0x48, 0x08, 0x3a, 0x7b, 0x70, 0x95, 0xcf, - 0xfc, 0x73, 0xd1, 0x7e, 0x12, 0x52, 0x35, 0x4d, 0xaf, 0x6d, 0x9f, 0xc7, 0x8e, 0xcf, 0x65, 0xcc, - 0x65, 0xf9, 0xd3, 0x97, 0xc1, 0xcc, 0x51, 0xf3, 0x04, 0xa4, 0xfd, 0x16, 0xfc, 0xfb, 0x45, 0xfb, - 0x58, 0xb7, 0xdb, 0x4e, 0xeb, 0xba, 0x0f, 0x27, 0x00, 0xa3, 0xbf, 0xfb, 0xaf, 0x55, 0xd4, 0xdc, - 0x9e, 0x0b, 0xbf, 0x44, 0x27, 0x5c, 0xd0, 0x90, 0x32, 0x12, 0x79, 0x12, 0x58, 0x00, 0xc2, 0x23, - 0x41, 0x20, 0x40, 0xca, 0xb2, 0xe7, 0xf1, 0x9a, 0x1e, 0x17, 0xec, 0x6b, 0x4d, 0xe2, 0x67, 0xa8, - 0x25, 0x60, 0x92, 0xb2, 0xc0, 0xf3, 0xa7, 0x84, 0x31, 0x88, 0x3c, 0x1a, 0x14, 0xb7, 0xd0, 0x70, - 0x0f, 0x34, 0xf1, 0x46, 0xe3, 0xc3, 0x00, 0x3f, 0x46, 0xcd, 0x52, 0x9b, 0x70, 0xa1, 0x72, 0xe1, - 0x4e, 0x21, 0xdc, 0xd7, 0xe8, 0x88, 0x0b, 0x35, 0x0c, 0xf0, 0x53, 0x54, 0x1a, 0x3d, 0x09, 0x9f, - 0x52, 0x60, 0x3e, 0x98, 0xbb, 0x1d, 0xa3, 0xb7, 0xeb, 0x96, 0xe6, 0x71, 0x89, 0xe2, 0xe7, 0xf9, - 0xd1, 0x4a, 0x50, 0x90, 0x9e, 0x80, 0x98, 0x50, 0x46, 0x59, 0x68, 0xd6, 0x3a, 0x46, 0xaf, 0xe6, - 0x1e, 0x96, 0x84, 0xbb, 0xc6, 0xb1, 0x89, 0x1e, 0x28, 0x1a, 0x03, 0x4f, 0x95, 0x59, 0x2f, 0xd2, - 0xd6, 0xdb, 0x81, 0x7f, 0xbb, 0xb4, 0x8c, 0xbb, 0xa5, 0x65, 0xfc, 0x5a, 0x5a, 0xc6, 0xb7, 0x95, - 0x55, 0xb9, 0x5b, 0x59, 0x95, 0x1f, 0x2b, 0xab, 0xf2, 0x61, 0xb8, 0x71, 0xed, 0x52, 0x09, 0xc2, - 0x42, 0x88, 0x78, 0x06, 0xfd, 0x0c, 0x98, 0x4a, 0x05, 0x48, 0x47, 0x7f, 0x3a, 0xfd, 0x09, 0x17, - 0x37, 0x44, 0x04, 0xfd, 0x98, 0x06, 0x41, 0x04, 0x37, 0x44, 0x80, 0x93, 0x5d, 0x38, 0xe5, 0xa3, - 0x29, 0xfe, 0x9d, 0xeb, 0x7a, 0xf1, 0x1e, 0x2e, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0xe8, 0x07, - 0x62, 0x7b, 0x4b, 0x03, 0x00, 0x00, + // 553 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0xcf, 0x6e, 0xd3, 0x3e, + 0x1c, 0x6f, 0xba, 0xad, 0xd3, 0xbc, 0xfd, 0xf6, 0xc7, 0xda, 0xb4, 0xfc, 0x76, 0x48, 0x4b, 0x85, + 0xa0, 0x02, 0x9a, 0x68, 0x9b, 0x84, 0xd0, 0x6e, 0x94, 0xc1, 0xd4, 0x5b, 0x95, 0xdd, 0x90, 0x50, + 0xe4, 0xc5, 0xdf, 0x66, 0xd6, 0x12, 0x3b, 0xd8, 0x4e, 0x46, 0x79, 0x0a, 0xce, 0xbc, 0x03, 0xef, + 0xb1, 0xe3, 0x8e, 0x88, 0x43, 0x85, 0xb6, 0x37, 0xd8, 0x13, 0xa0, 0xd8, 0x29, 0xb4, 0x82, 0x53, + 0xed, 0xcf, 0x3f, 0x7f, 0x3f, 0x75, 0x8c, 0xf6, 0xa5, 0x28, 0x34, 0xc8, 0xa0, 0x3c, 0x0c, 0x12, + 0xe0, 0xa0, 0x98, 0xf2, 0x73, 0x29, 0xb4, 0xc0, 0x6b, 0x96, 0xf0, 0xcb, 0xc3, 0x83, 0xdd, 0x44, + 0x24, 0xc2, 0xa0, 0x41, 0xb5, 0xb2, 0x82, 0xee, 0xd7, 0x26, 0xda, 0x38, 0xb3, 0x96, 0x73, 0x4d, + 0x34, 0xe0, 0x00, 0xb5, 0x72, 0x22, 0x49, 0xa6, 0x5c, 0xa7, 0xe3, 0xf4, 0xd6, 0x8f, 0x76, 0xfc, + 0xdf, 0x11, 0xfe, 0xc8, 0x10, 0x83, 0xe5, 0x9b, 0x69, 0xbb, 0x11, 0xd6, 0x32, 0xfc, 0x19, 0xed, + 0x30, 0x1e, 0x8d, 0x53, 0x96, 0x5c, 0xea, 0x28, 0x27, 0xf1, 0x15, 0x68, 0xe5, 0x36, 0x3b, 0x4b, + 0xbd, 0xf5, 0xa3, 0x17, 0x73, 0xde, 0xf9, 0x43, 0xfc, 0x21, 0x7f, 0x67, 0xf4, 0x23, 0x2b, 0x7f, + 0xcb, 0xb5, 0x9c, 0x0c, 0x3a, 0x55, 0xec, 0xc3, 0xb4, 0xed, 0x4e, 0x48, 0x96, 0x9e, 0x74, 0xff, + 0x0a, 0xed, 0x86, 0x5b, 0x6c, 0xd1, 0x77, 0xf0, 0x01, 0xed, 0xfe, 0x2b, 0x0a, 0x6f, 0xa3, 0xa5, + 0x2b, 0x98, 0x98, 0x06, 0x6b, 0x61, 0xb5, 0xc4, 0x01, 0x5a, 0x29, 0x49, 0x5a, 0x80, 0xdb, 0x34, + 0xad, 0xfe, 0x9f, 0x9b, 0x6c, 0x31, 0x21, 0xb4, 0xba, 0x93, 0xe6, 0x2b, 0xa7, 0xfb, 0x09, 0xb5, + 0x6c, 0x65, 0xcc, 0xd1, 0xe6, 0x18, 0x20, 0xca, 0x41, 0xc6, 0xc0, 0x35, 0x49, 0xc0, 0x66, 0x0f, + 0xce, 0xaa, 0x99, 0x7f, 0x4c, 0xdb, 0x4f, 0x12, 0xa6, 0x2f, 0x8b, 0x0b, 0x3f, 0x16, 0x59, 0x10, + 0x0b, 0x95, 0x09, 0x55, 0xff, 0xf4, 0x15, 0xbd, 0x0a, 0xf4, 0x24, 0x07, 0xe5, 0x9f, 0x42, 0xfc, + 0x30, 0x6d, 0xef, 0xd9, 0x76, 0x8b, 0x69, 0xdd, 0xf0, 0xbf, 0x31, 0xc0, 0xe8, 0xcf, 0xfe, 0x5b, + 0x13, 0x6d, 0x2e, 0xce, 0x85, 0x5f, 0xa2, 0x7d, 0x21, 0x59, 0xc2, 0x38, 0x49, 0x23, 0x05, 0x9c, + 0x82, 0x8c, 0x08, 0xa5, 0x12, 0x94, 0xaa, 0x7b, 0xee, 0xcd, 0xe8, 0x73, 0xc3, 0xbe, 0xb6, 0x24, + 0x7e, 0x86, 0x76, 0x24, 0x8c, 0x0b, 0x4e, 0xa3, 0xf8, 0x92, 0x70, 0x0e, 0x69, 0xc4, 0xa8, 0xf9, + 0x17, 0xd6, 0xc2, 0x2d, 0x4b, 0xbc, 0xb1, 0xf8, 0x90, 0xe2, 0xc7, 0x68, 0xb3, 0xd6, 0xe6, 0x42, + 0xea, 0x4a, 0xb8, 0x64, 0x84, 0x1b, 0x16, 0x1d, 0x09, 0xa9, 0x87, 0x14, 0x3f, 0x45, 0xb5, 0x31, + 0x52, 0xf0, 0xb1, 0x00, 0x1e, 0x83, 0xbb, 0xdc, 0x71, 0x7a, 0xcb, 0x61, 0x6d, 0x3e, 0xaf, 0x51, + 0xfc, 0x08, 0xd5, 0xc6, 0x88, 0x02, 0x17, 0x99, 0xbb, 0x62, 0xc2, 0xd6, 0x2d, 0x76, 0x5a, 0x41, + 0xf8, 0x79, 0x35, 0x9d, 0x96, 0x0c, 0x54, 0x24, 0x21, 0x23, 0x8c, 0x33, 0x9e, 0xb8, 0xad, 0x8e, + 0xd3, 0x5b, 0x09, 0xb7, 0x6b, 0x22, 0x9c, 0xe1, 0xd8, 0x45, 0xab, 0x9a, 0x65, 0x20, 0x0a, 0xed, + 0xae, 0x9a, 0x03, 0x67, 0xdb, 0x41, 0x7c, 0x73, 0xe7, 0x39, 0xb7, 0x77, 0x9e, 0xf3, 0xf3, 0xce, + 0x73, 0xbe, 0xdc, 0x7b, 0x8d, 0xdb, 0x7b, 0xaf, 0xf1, 0xfd, 0xde, 0x6b, 0xbc, 0x1f, 0xce, 0xdd, + 0x8c, 0xd2, 0x92, 0xf0, 0x04, 0x52, 0x51, 0x42, 0xbf, 0x04, 0xae, 0x0b, 0x09, 0x2a, 0xb0, 0x5f, + 0x57, 0x7f, 0x2c, 0xe4, 0x35, 0x91, 0xb4, 0x9f, 0x31, 0x4a, 0x53, 0xb8, 0x26, 0x12, 0x82, 0xf2, + 0x38, 0xa8, 0xdf, 0x95, 0xb9, 0xc0, 0x8b, 0x96, 0x79, 0x32, 0xc7, 0xbf, 0x02, 0x00, 0x00, 0xff, + 0xff, 0x62, 0xc8, 0x1b, 0x5a, 0x6e, 0x03, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -359,12 +374,19 @@ func (m *InFlightPacket) MarshalToSizedBuffer(dAtA []byte) (int, error) { if m.Timeout != 0 { i = encodeVarintGenesis(dAtA, i, uint64(m.Timeout)) i-- - dAtA[i] = 0x30 + dAtA[i] = 0x38 } if m.RetriesRemaining != 0 { i = encodeVarintGenesis(dAtA, i, uint64(m.RetriesRemaining)) i-- - dAtA[i] = 0x28 + dAtA[i] = 0x30 + } + if len(m.RefundDenom) > 0 { + i -= len(m.RefundDenom) + copy(dAtA[i:], m.RefundDenom) + i = encodeVarintGenesis(dAtA, i, uint64(len(m.RefundDenom))) + i-- + dAtA[i] = 0x2a } if m.RefundSequence != 0 { i = encodeVarintGenesis(dAtA, i, uint64(m.RefundSequence)) @@ -458,6 +480,10 @@ func (m *InFlightPacket) Size() (n int) { if m.RefundSequence != 0 { n += 1 + sovGenesis(uint64(m.RefundSequence)) } + l = len(m.RefundDenom) + if l > 0 { + n += 1 + l + sovGenesis(uint64(l)) + } if m.RetriesRemaining != 0 { n += 1 + sovGenesis(uint64(m.RetriesRemaining)) } @@ -914,6 +940,38 @@ func (m *InFlightPacket) Unmarshal(dAtA []byte) error { } } case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field RefundDenom", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + 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 ErrInvalidLengthGenesis + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.RefundDenom = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 6: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field RetriesRemaining", wireType) } @@ -932,7 +990,7 @@ func (m *InFlightPacket) Unmarshal(dAtA []byte) error { break } } - case 6: + case 7: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Timeout", wireType) } From 967f201b41c6ae6229c3aea63817bb6a0d791d08 Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Sat, 5 Nov 2022 17:12:05 -0600 Subject: [PATCH 11/24] Add more debug logs around denom. Use refund denom for ack/timeout refunds --- router/module.go | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/router/module.go b/router/module.go index 61d61d7..019523d 100644 --- a/router/module.go +++ b/router/module.go @@ -313,6 +313,17 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re // TODO can we unwrap denom instead of requiring RefundDenom to be stored on InFlightPacket? token := sdk.NewCoin(inFlightPacket.RefundDenom, amount) + denomTrace := transfertypes.ParseDenomTrace(data.Denom) + ibcDenom := denomTrace.IBCDenom() + + am.keeper.Logger(ctx).Debug("packetForwardMiddleware RefundForwardedPacket from OnRecvPacket", + "sequence", packet.Sequence, + "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, + "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, + "amount", data.Amount, + "raw_denom", data.Denom, "denom_trace", denomTrace, "ibc_denom", ibcDenom, "refund_denom", inFlightPacket.RefundDenom, + ) + // pass along refund to previous hop in multi-hop. am.keeper.RefundForwardedPacket(ctx, inFlightPacket.RefundChannelId, inFlightPacket.RefundPortId, inFlightPacket.RefundSequence, data.Receiver, inFlightPacket.OriginalSenderAddress, token, am.refundTimeout) return nil @@ -415,6 +426,18 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes return nil } + denomTrace := transfertypes.ParseDenomTrace(data.Denom) + ibcDenom := denomTrace.IBCDenom() + + am.keeper.Logger(ctx).Debug("packetForwardMiddleware RefundForwardedPacket from OnAcknowledgementPacket", + "sequence", packet.Sequence, + "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, + "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, + "amount", data.Amount, + "raw_denom", data.Denom, "denom_trace", denomTrace, "ibc_denom", ibcDenom, + "refund_denom", inFlightPacket.RefundDenom, + ) + am.keeper.RefundForwardedPacket( ctx, inFlightPacket.RefundChannelId, @@ -422,7 +445,7 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes inFlightPacket.RefundSequence, data.Sender, inFlightPacket.OriginalSenderAddress, - sdk.NewCoin(transfertypes.ParseDenomTrace(data.Denom).IBCDenom(), amount), + sdk.NewCoin(inFlightPacket.RefundDenom, amount), am.refundTimeout, ) return nil @@ -487,6 +510,18 @@ func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, return nil } + denomTrace := transfertypes.ParseDenomTrace(data.Denom) + ibcDenom := denomTrace.IBCDenom() + + am.keeper.Logger(ctx).Debug("packetForwardMiddleware RefundForwardedPacket from OnTimeoutPacket", + "sequence", packet.Sequence, + "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, + "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, + "amount", data.Amount, + "raw_denom", data.Denom, "denom_trace", denomTrace, "ibc_denom", ibcDenom, + "refund_denom", inFlightPacket.RefundDenom, + ) + am.keeper.RefundForwardedPacket( ctx, inFlightPacket.RefundChannelId, @@ -494,7 +529,7 @@ func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, inFlightPacket.RefundSequence, data.Sender, inFlightPacket.OriginalSenderAddress, - sdk.NewCoin(transfertypes.ParseDenomTrace(data.Denom).IBCDenom(), amount), + sdk.NewCoin(inFlightPacket.RefundDenom, amount), am.refundTimeout, ) return nil From b7965077c4ce982b7e5adf847188ee7ebafc1a11 Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Sat, 5 Nov 2022 17:29:25 -0600 Subject: [PATCH 12/24] Use non-hashed denoms on timeout/ack. If this works, we can remove RefundDenom --- router/module.go | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/router/module.go b/router/module.go index 019523d..a34ebf0 100644 --- a/router/module.go +++ b/router/module.go @@ -299,9 +299,24 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re return nil } - amount, ok := sdk.NewIntFromString(data.Amount) - if !ok { - am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing amount from string for multi-hop refund", + // amount, ok := sdk.NewIntFromString(data.Amount) + // if !ok { + // am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing amount from string for multi-hop refund", + // "sequence", packet.Sequence, + // "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, + // "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, + // "amount", data.Amount, "denom", data.Denom, + // "error", err, + // ) + // return nil + // } + + // TODO can we unwrap denom instead of requiring RefundDenom to be stored on InFlightPacket? + // token := sdk.NewCoin(inFlightPacket.RefundDenom, amount) + + token, err := am.NextHopCoin(ctx, packet.SourcePort, packet.SourceChannel, packet.DestinationPort, packet.DestinationChannel, data.Denom, data.Amount) + if err != nil { + am.keeper.Logger(ctx).Error("packetForwardMiddleware error getting next hop coin", "sequence", packet.Sequence, "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, @@ -310,8 +325,6 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re ) return nil } - // TODO can we unwrap denom instead of requiring RefundDenom to be stored on InFlightPacket? - token := sdk.NewCoin(inFlightPacket.RefundDenom, amount) denomTrace := transfertypes.ParseDenomTrace(data.Denom) ibcDenom := denomTrace.IBCDenom() @@ -445,7 +458,7 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes inFlightPacket.RefundSequence, data.Sender, inFlightPacket.OriginalSenderAddress, - sdk.NewCoin(inFlightPacket.RefundDenom, amount), + sdk.NewCoin(data.Denom, amount), am.refundTimeout, ) return nil @@ -529,7 +542,7 @@ func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, inFlightPacket.RefundSequence, data.Sender, inFlightPacket.OriginalSenderAddress, - sdk.NewCoin(inFlightPacket.RefundDenom, amount), + sdk.NewCoin(data.Denom, amount), am.refundTimeout, ) return nil From 535b41d59b2adb6d3df597c2cde0f806f9fe3c67 Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Sat, 5 Nov 2022 18:22:31 -0600 Subject: [PATCH 13/24] Parse denoms at every step --- router/keeper/keeper.go | 10 ++-- router/module.go | 115 ++++++++++++++++++++-------------------- 2 files changed, 64 insertions(+), 61 deletions(-) diff --git a/router/keeper/keeper.go b/router/keeper/keeper.go index bdb0090..bd8e1d4 100644 --- a/router/keeper/keeper.go +++ b/router/keeper/keeper.go @@ -108,7 +108,6 @@ func (k Keeper) ForwardTransferPacket( receiver string, metadata *ForwardMetadata, token sdk.Coin, - refundDenom string, maxRetries uint8, timeout time.Duration, labels []metrics.Label, @@ -180,7 +179,7 @@ func (k Keeper) ForwardTransferPacket( RefundChannelId: srcPacket.DestinationChannel, RefundPortId: srcPacket.DestinationPort, RefundSequence: srcPacket.Sequence, - RefundDenom: refundDenom, + RefundDenom: token.Denom, RetriesRemaining: int32(maxRetries), Timeout: uint64(timeout.Nanoseconds()), } @@ -257,6 +256,10 @@ func (k Keeper) HandleTimeout( Port: packet.SourcePort, } + if data.Memo != "" { + metadata.Next = &data.Memo + } + amount, ok := sdk.NewIntFromString(data.Amount) if !ok { k.Logger(ctx).Error("packetForwardMiddleware error parsing amount from string for router retry", @@ -274,7 +277,7 @@ func (k Keeper) HandleTimeout( var token = sdk.NewCoin(denom, amount) - // srcPacket, srcPacketSender, and refundDenom are empty because inFlightPacket is non-nil. + // srcPacket and srcPacketSender are empty because inFlightPacket is non-nil. return k.ForwardTransferPacket( ctx, &inFlightPacket, @@ -283,7 +286,6 @@ func (k Keeper) HandleTimeout( data.Sender, metadata, token, - "", uint8(inFlightPacket.RetriesRemaining), time.Duration(inFlightPacket.Timeout)*time.Nanosecond, nil, diff --git a/router/module.go b/router/module.go index a34ebf0..ea4ed54 100644 --- a/router/module.go +++ b/router/module.go @@ -5,6 +5,7 @@ import ( "encoding/json" "fmt" "math/rand" + "strings" "time" "github.com/armon/go-metrics" @@ -224,44 +225,22 @@ func (am AppModule) OnChanCloseConfirm(ctx sdk.Context, portID, channelID string return am.app.OnChanCloseConfirm(ctx, portID, channelID) } -// NextHopCoin assembles a token with the correct denom for the next hop. -func (am AppModule) NextHopCoin(ctx sdk.Context, srcPort, srcChannel, dstPort, dstChannel, denom, amount string) (sdk.Coin, error) { - // recalculate denom, skip checks that were already done in app.OnRecvPacket - var denomOut string - - if transfertypes.ReceiverChainIsSource(srcPort, srcChannel, denom) { - am.keeper.Logger(ctx).Debug("packetForwardMiddleware NextHopCoin receiver chain is source", - "src_port", srcPort, "src_channel", srcChannel, - "dst_port", dstPort, "dst_channel", dstChannel, - "denom", denom, "amount", amount, - ) - // remove prefix added by sender chain - voucherPrefix := transfertypes.GetDenomPrefix(srcPort, srcChannel) - unprefixedDenom := denom[len(voucherPrefix):] - - // coin denomination used in sending from the escrow address - denomOut = unprefixedDenom - - // The denomination used to send the coins is either the native denom or the hash of the path - // if the denomination is not native. - denomTrace := transfertypes.ParseDenomTrace(unprefixedDenom) - if denomTrace.Path != "" { - denomOut = denomTrace.IBCDenom() +func GetDenomForThisChain(port, channel, counterpartyPort, counterpartyChannel, denom string) string { + counterpartyPrefix := transfertypes.GetDenomPrefix(counterpartyPort, counterpartyChannel) + if strings.HasPrefix(denom, counterpartyPrefix) { + // unwind denom + unwoundDenom := denom[len(counterpartyPrefix):] + denomTrace := transfertypes.ParseDenomTrace(unwoundDenom) + if denomTrace.Path == "" { + // denom is now unwound back to native denom + return unwoundDenom } - } else { - am.keeper.Logger(ctx).Debug("packetForwardMiddleware NextHopCoin sender chain is source", - "src_port", srcPort, "src_channel", srcChannel, - "dst_port", dstPort, "dst_channel", dstChannel, - "denom", denom, "amount", amount, - ) - prefixedDenom := transfertypes.GetDenomPrefix(dstPort, dstChannel) + denom - denomOut = transfertypes.ParseDenomTrace(prefixedDenom).IBCDenom() - } - unit, err := sdk.ParseUint(amount) - if err != nil { - return sdk.Coin{}, err + // denom is still IBC denom + return denomTrace.IBCDenom() } - return sdk.NewCoin(denomOut, sdk.NewIntFromUint64(unit.Uint64())), nil + // append port and channel from this chain to denom + prefixedDenom := transfertypes.GetDenomPrefix(port, channel) + denom + return transfertypes.ParseDenomTrace(prefixedDenom).IBCDenom() } // OnRecvPacket implements the IBCModule interface. @@ -314,31 +293,39 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re // TODO can we unwrap denom instead of requiring RefundDenom to be stored on InFlightPacket? // token := sdk.NewCoin(inFlightPacket.RefundDenom, amount) - token, err := am.NextHopCoin(ctx, packet.SourcePort, packet.SourceChannel, packet.DestinationPort, packet.DestinationChannel, data.Denom, data.Amount) - if err != nil { - am.keeper.Logger(ctx).Error("packetForwardMiddleware error getting next hop coin", + denomOnThisChain := GetDenomForThisChain( + packet.DestinationPort, packet.DestinationChannel, + packet.SourcePort, packet.SourceChannel, + data.Denom, + ) + + amountInt, ok := sdk.NewIntFromString(data.Amount) + if !ok { + am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing amount for refund", "sequence", packet.Sequence, "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, "amount", data.Amount, "denom", data.Denom, "error", err, ) - return nil } - denomTrace := transfertypes.ParseDenomTrace(data.Denom) - ibcDenom := denomTrace.IBCDenom() - am.keeper.Logger(ctx).Debug("packetForwardMiddleware RefundForwardedPacket from OnRecvPacket", "sequence", packet.Sequence, "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, "amount", data.Amount, - "raw_denom", data.Denom, "denom_trace", denomTrace, "ibc_denom", ibcDenom, "refund_denom", inFlightPacket.RefundDenom, + "raw_denom", data.Denom, "denom_on_this_chain", denomOnThisChain, ) // pass along refund to previous hop in multi-hop. - am.keeper.RefundForwardedPacket(ctx, inFlightPacket.RefundChannelId, inFlightPacket.RefundPortId, inFlightPacket.RefundSequence, data.Receiver, inFlightPacket.OriginalSenderAddress, token, am.refundTimeout) + am.keeper.RefundForwardedPacket( + ctx, + inFlightPacket.RefundChannelId, inFlightPacket.RefundPortId, inFlightPacket.RefundSequence, + data.Receiver, inFlightPacket.OriginalSenderAddress, + sdk.NewCoin(denomOnThisChain, amountInt), + am.refundTimeout, + ) return nil } @@ -351,11 +338,19 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re return ack } - token, err := am.NextHopCoin(ctx, packet.SourcePort, packet.SourceChannel, packet.DestinationPort, packet.DestinationChannel, data.Denom, data.Amount) - if err != nil { - return channeltypes.NewErrorAcknowledgement(err.Error()) + denomOnThisChain := GetDenomForThisChain( + packet.DestinationPort, packet.DestinationChannel, + packet.SourcePort, packet.SourceChannel, + data.Denom, + ) + + amountInt, ok := sdk.NewIntFromString(data.Amount) + if !ok { + return channeltypes.NewErrorAcknowledgement(fmt.Sprintf("error parsing amount for forward: %s", data.Amount)) } + token := sdk.NewCoin(denomOnThisChain, amountInt) + var timeout time.Duration if metadata.Timeout.Nanoseconds() > 0 { timeout = metadata.Timeout @@ -370,7 +365,7 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re retries = am.retriesOnTimeout } - err = am.keeper.ForwardTransferPacket(ctx, nil, packet, data.Sender, data.Receiver, metadata, token, data.Denom, retries, timeout, []metrics.Label{}) + err = am.keeper.ForwardTransferPacket(ctx, nil, packet, data.Sender, data.Receiver, metadata, token, retries, timeout, []metrics.Label{}) if err != nil { // Don't think this is needed since ack error will issue refund on previous chain. // am.keeper.RefundForwardedPacket(ctx, packet.DestinationChannel, packet.DestinationPort, packet.Sequence, data.Receiver, data.Sender, token, am.refundTimeout) @@ -439,15 +434,18 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes return nil } - denomTrace := transfertypes.ParseDenomTrace(data.Denom) - ibcDenom := denomTrace.IBCDenom() + denomOnThisChain := GetDenomForThisChain( + packet.SourcePort, packet.SourceChannel, + packet.DestinationPort, packet.DestinationChannel, + data.Denom, + ) am.keeper.Logger(ctx).Debug("packetForwardMiddleware RefundForwardedPacket from OnAcknowledgementPacket", "sequence", packet.Sequence, "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, "amount", data.Amount, - "raw_denom", data.Denom, "denom_trace", denomTrace, "ibc_denom", ibcDenom, + "raw_denom", data.Denom, "denom_on_this_chain", denomOnThisChain, "refund_denom", inFlightPacket.RefundDenom, ) @@ -458,7 +456,7 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes inFlightPacket.RefundSequence, data.Sender, inFlightPacket.OriginalSenderAddress, - sdk.NewCoin(data.Denom, amount), + sdk.NewCoin(denomOnThisChain, amount), am.refundTimeout, ) return nil @@ -523,15 +521,18 @@ func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, return nil } - denomTrace := transfertypes.ParseDenomTrace(data.Denom) - ibcDenom := denomTrace.IBCDenom() + denomOnThisChain := GetDenomForThisChain( + packet.SourcePort, packet.SourceChannel, + packet.DestinationPort, packet.DestinationChannel, + data.Denom, + ) am.keeper.Logger(ctx).Debug("packetForwardMiddleware RefundForwardedPacket from OnTimeoutPacket", "sequence", packet.Sequence, "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, "amount", data.Amount, - "raw_denom", data.Denom, "denom_trace", denomTrace, "ibc_denom", ibcDenom, + "raw_denom", data.Denom, "denom_on_this_chain", denomOnThisChain, "refund_denom", inFlightPacket.RefundDenom, ) @@ -542,7 +543,7 @@ func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, inFlightPacket.RefundSequence, data.Sender, inFlightPacket.OriginalSenderAddress, - sdk.NewCoin(data.Denom, amount), + sdk.NewCoin(denomOnThisChain, amount), am.refundTimeout, ) return nil From b5d9f616c4a70b6a32ced3adefc3947dd0f5dd66 Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Sat, 5 Nov 2022 18:26:47 -0600 Subject: [PATCH 14/24] For timeout/ack, try to resolve IBC denom --- router/module.go | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/router/module.go b/router/module.go index ea4ed54..3d0e8c1 100644 --- a/router/module.go +++ b/router/module.go @@ -293,11 +293,11 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re // TODO can we unwrap denom instead of requiring RefundDenom to be stored on InFlightPacket? // token := sdk.NewCoin(inFlightPacket.RefundDenom, amount) - denomOnThisChain := GetDenomForThisChain( - packet.DestinationPort, packet.DestinationChannel, - packet.SourcePort, packet.SourceChannel, - data.Denom, - ) + denom := data.Denom + denomTrace := transfertypes.ParseDenomTrace(data.Denom) + if denomTrace.Path != "" { + denom = denomTrace.IBCDenom() + } amountInt, ok := sdk.NewIntFromString(data.Amount) if !ok { @@ -315,7 +315,7 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, "amount", data.Amount, - "raw_denom", data.Denom, "denom_on_this_chain", denomOnThisChain, + "raw_denom", data.Denom, "denom_on_this_chain", denom, ) // pass along refund to previous hop in multi-hop. @@ -323,7 +323,7 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re ctx, inFlightPacket.RefundChannelId, inFlightPacket.RefundPortId, inFlightPacket.RefundSequence, data.Receiver, inFlightPacket.OriginalSenderAddress, - sdk.NewCoin(denomOnThisChain, amountInt), + sdk.NewCoin(denom, amountInt), am.refundTimeout, ) return nil @@ -434,18 +434,18 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes return nil } - denomOnThisChain := GetDenomForThisChain( - packet.SourcePort, packet.SourceChannel, - packet.DestinationPort, packet.DestinationChannel, - data.Denom, - ) + denom := data.Denom + denomTrace := transfertypes.ParseDenomTrace(data.Denom) + if denomTrace.Path != "" { + denom = denomTrace.IBCDenom() + } am.keeper.Logger(ctx).Debug("packetForwardMiddleware RefundForwardedPacket from OnAcknowledgementPacket", "sequence", packet.Sequence, "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, "amount", data.Amount, - "raw_denom", data.Denom, "denom_on_this_chain", denomOnThisChain, + "raw_denom", data.Denom, "denom_on_this_chain", denom, "refund_denom", inFlightPacket.RefundDenom, ) @@ -456,7 +456,7 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes inFlightPacket.RefundSequence, data.Sender, inFlightPacket.OriginalSenderAddress, - sdk.NewCoin(denomOnThisChain, amount), + sdk.NewCoin(denom, amount), am.refundTimeout, ) return nil From daed4625ed4171739387db2328cbd6a84385b62f Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Sat, 5 Nov 2022 18:40:43 -0600 Subject: [PATCH 15/24] Fix flipped OnRecvPacket/OnTimeout denom handling --- router/module.go | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/router/module.go b/router/module.go index 3d0e8c1..1aaf4ea 100644 --- a/router/module.go +++ b/router/module.go @@ -293,11 +293,11 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re // TODO can we unwrap denom instead of requiring RefundDenom to be stored on InFlightPacket? // token := sdk.NewCoin(inFlightPacket.RefundDenom, amount) - denom := data.Denom - denomTrace := transfertypes.ParseDenomTrace(data.Denom) - if denomTrace.Path != "" { - denom = denomTrace.IBCDenom() - } + denomOnThisChain := GetDenomForThisChain( + packet.SourcePort, packet.SourceChannel, + packet.DestinationPort, packet.DestinationChannel, + data.Denom, + ) amountInt, ok := sdk.NewIntFromString(data.Amount) if !ok { @@ -315,7 +315,7 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, "amount", data.Amount, - "raw_denom", data.Denom, "denom_on_this_chain", denom, + "raw_denom", data.Denom, "denom_on_this_chain", denomOnThisChain, ) // pass along refund to previous hop in multi-hop. @@ -323,7 +323,7 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re ctx, inFlightPacket.RefundChannelId, inFlightPacket.RefundPortId, inFlightPacket.RefundSequence, data.Receiver, inFlightPacket.OriginalSenderAddress, - sdk.NewCoin(denom, amountInt), + sdk.NewCoin(denomOnThisChain, amountInt), am.refundTimeout, ) return nil @@ -521,18 +521,18 @@ func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, return nil } - denomOnThisChain := GetDenomForThisChain( - packet.SourcePort, packet.SourceChannel, - packet.DestinationPort, packet.DestinationChannel, - data.Denom, - ) + denom := data.Denom + denomTrace := transfertypes.ParseDenomTrace(data.Denom) + if denomTrace.Path != "" { + denom = denomTrace.IBCDenom() + } am.keeper.Logger(ctx).Debug("packetForwardMiddleware RefundForwardedPacket from OnTimeoutPacket", "sequence", packet.Sequence, "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, "amount", data.Amount, - "raw_denom", data.Denom, "denom_on_this_chain", denomOnThisChain, + "raw_denom", data.Denom, "denom_on_this_chain", denom, "refund_denom", inFlightPacket.RefundDenom, ) @@ -543,7 +543,7 @@ func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, inFlightPacket.RefundSequence, data.Sender, inFlightPacket.OriginalSenderAddress, - sdk.NewCoin(denomOnThisChain, amount), + sdk.NewCoin(denom, amount), am.refundTimeout, ) return nil From cf39e9b0ce991d99999846d914bc267e9cdedb78 Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Sat, 5 Nov 2022 19:07:51 -0600 Subject: [PATCH 16/24] Add more debug logs --- router/module.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/router/module.go b/router/module.go index 1aaf4ea..ae11b73 100644 --- a/router/module.go +++ b/router/module.go @@ -261,19 +261,23 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re err := json.Unmarshal([]byte(data.Memo), m) if err != nil || m.Forward == nil { // not a packet that should be forwarded + am.keeper.Logger(ctx).Debug("packetForwardMiddleware OnRecvPacket forward metadata does not exist") return am.app.OnRecvPacket(ctx, packet, relayer) } metadata := m.Forward if m.Forward.RefundSequence != nil { + am.keeper.Logger(ctx).Debug("packetForwardMiddleware RefundSequence exists") ack := am.app.OnRecvPacket(ctx, packet, relayer) if !ack.Success() { + am.keeper.Logger(ctx).Error("packetForwardMiddleware RefundSequence exists but ack failed") return ack } inFlightPacket := am.keeper.GetAndClearInFlightPacket(ctx, packet.DestinationChannel, packet.DestinationPort, *m.Forward.RefundSequence) if inFlightPacket == nil { + am.keeper.Logger(ctx).Error("packetForwardMiddleware RefundSequence exists but inFlightPacket is nil") // this is either not a forwarded packet, or it is the final destination for the refund. return nil } @@ -308,6 +312,7 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re "amount", data.Amount, "denom", data.Denom, "error", err, ) + return nil } am.keeper.Logger(ctx).Debug("packetForwardMiddleware RefundForwardedPacket from OnRecvPacket", @@ -400,8 +405,8 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes } var ack channeltypes.Acknowledgement - if err := json.Unmarshal(acknowledgement, &ack); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrJSONUnmarshal, err.Error()) + if err := channeltypes.SubModuleCdc.UnmarshalJSON(acknowledgement, &ack); err != nil { + return sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-20 transfer packet acknowledgement: %v", err) } if !ack.Success() { From b285fb0c3ecfc6de6bf87ece40f21d3e8df9be68 Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Sat, 5 Nov 2022 19:36:45 -0600 Subject: [PATCH 17/24] Don't remove from store on successful ack for now --- router/module.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/router/module.go b/router/module.go index ae11b73..8b50f84 100644 --- a/router/module.go +++ b/router/module.go @@ -467,8 +467,13 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes return nil } + // TODO: this assumption no longer works, because multi-hop refunds depend + // on the InFlightPacket being in the store on previous chains. Need to find a better way to cleanup InFlightPackets, + // or curry into Next metadata so that the entire refund path can be re-created. + // For successful ack, we no longer need to track this packet. - am.keeper.RemoveInFlightPacket(ctx, packet) + // am.keeper.RemoveInFlightPacket(ctx, packet) + return nil } From 627820a082d9c1f123860918f0e69f23c5f62dc3 Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Sat, 5 Nov 2022 19:54:26 -0600 Subject: [PATCH 18/24] Remove RefundDenom --- proto/router/v1/genesis.proto | 7 +- router/keeper/keeper.go | 1 - router/module.go | 45 +----------- router/types/genesis.pb.go | 132 +++++++++++----------------------- 4 files changed, 44 insertions(+), 141 deletions(-) diff --git a/proto/router/v1/genesis.proto b/proto/router/v1/genesis.proto index b8416a3..5fbb23a 100644 --- a/proto/router/v1/genesis.proto +++ b/proto/router/v1/genesis.proto @@ -36,7 +36,6 @@ message InFlightPacket { string refund_channel_id = 2; string refund_port_id = 3; uint64 refund_sequence = 4; - string refund_denom = 5; - int32 retries_remaining = 6; - uint64 timeout = 7; -} \ No newline at end of file + int32 retries_remaining = 5; + uint64 timeout = 6; +} diff --git a/router/keeper/keeper.go b/router/keeper/keeper.go index bd8e1d4..b05830e 100644 --- a/router/keeper/keeper.go +++ b/router/keeper/keeper.go @@ -179,7 +179,6 @@ func (k Keeper) ForwardTransferPacket( RefundChannelId: srcPacket.DestinationChannel, RefundPortId: srcPacket.DestinationPort, RefundSequence: srcPacket.Sequence, - RefundDenom: token.Denom, RetriesRemaining: int32(maxRetries), Timeout: uint64(timeout.Nanoseconds()), } diff --git a/router/module.go b/router/module.go index 8b50f84..63c821c 100644 --- a/router/module.go +++ b/router/module.go @@ -282,21 +282,6 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re return nil } - // amount, ok := sdk.NewIntFromString(data.Amount) - // if !ok { - // am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing amount from string for multi-hop refund", - // "sequence", packet.Sequence, - // "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, - // "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, - // "amount", data.Amount, "denom", data.Denom, - // "error", err, - // ) - // return nil - // } - - // TODO can we unwrap denom instead of requiring RefundDenom to be stored on InFlightPacket? - // token := sdk.NewCoin(inFlightPacket.RefundDenom, amount) - denomOnThisChain := GetDenomForThisChain( packet.SourcePort, packet.SourceChannel, packet.DestinationPort, packet.DestinationChannel, @@ -381,7 +366,6 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re // OnAcknowledgementPacket implements the IBCModule interface func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes.Packet, acknowledgement []byte, relayer sdk.AccAddress) error { - // TODO only need to do unmarshalling in !ack.Success() branch below. Using this only for debug log. var data transfertypes.FungibleTokenPacketData if err := transfertypes.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing packet data from ack packet", @@ -416,18 +400,6 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes return nil } - // TODO uncomment this once debug log removed above. - // var data transfertypes.FungibleTokenPacketData - // if err := transfertypes.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { - // am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing packet data from ack for refund", - // "sequence", packet.Sequence, - // "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, - // "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, - // "error", err, - // ) - // return nil - // } - amount, ok := sdk.NewIntFromString(data.Amount) if !ok { am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing amount from string for refund on ack", @@ -451,7 +423,6 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, "amount", data.Amount, "raw_denom", data.Denom, "denom_on_this_chain", denom, - "refund_denom", inFlightPacket.RefundDenom, ) am.keeper.RefundForwardedPacket( @@ -479,7 +450,6 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes // OnTimeoutPacket implements the IBCModule interface func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, relayer sdk.AccAddress) error { - // TODO only need to do unmarshalling in HandleTimeout error branch below. Using this only for debug log. var data transfertypes.FungibleTokenPacketData if err := transfertypes.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing packet data from timeout packet", @@ -508,18 +478,6 @@ func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, return nil } - // TODO uncomment this once debug log removed above. - // var data transfertypes.FungibleTokenPacketData - // if err := transfertypes.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { - // am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing packet data from timeout for refund", - // "sequence", packet.Sequence, - // "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, - // "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, - // "error", err, - // ) - // return nil - // } - amount, ok := sdk.NewIntFromString(data.Amount) if !ok { am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing amount from string for refund on timeout", @@ -542,8 +500,7 @@ func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, "amount", data.Amount, - "raw_denom", data.Denom, "denom_on_this_chain", denom, - "refund_denom", inFlightPacket.RefundDenom, + "raw_denom", data.Denom, "denom", denom, ) am.keeper.RefundForwardedPacket( diff --git a/router/types/genesis.pb.go b/router/types/genesis.pb.go index df6a0c3..0ed5c50 100644 --- a/router/types/genesis.pb.go +++ b/router/types/genesis.pb.go @@ -126,9 +126,8 @@ type InFlightPacket struct { RefundChannelId string `protobuf:"bytes,2,opt,name=refund_channel_id,json=refundChannelId,proto3" json:"refund_channel_id,omitempty"` RefundPortId string `protobuf:"bytes,3,opt,name=refund_port_id,json=refundPortId,proto3" json:"refund_port_id,omitempty"` RefundSequence uint64 `protobuf:"varint,4,opt,name=refund_sequence,json=refundSequence,proto3" json:"refund_sequence,omitempty"` - RefundDenom string `protobuf:"bytes,5,opt,name=refund_denom,json=refundDenom,proto3" json:"refund_denom,omitempty"` - RetriesRemaining int32 `protobuf:"varint,6,opt,name=retries_remaining,json=retriesRemaining,proto3" json:"retries_remaining,omitempty"` - Timeout uint64 `protobuf:"varint,7,opt,name=timeout,proto3" json:"timeout,omitempty"` + RetriesRemaining int32 `protobuf:"varint,5,opt,name=retries_remaining,json=retriesRemaining,proto3" json:"retries_remaining,omitempty"` + Timeout uint64 `protobuf:"varint,6,opt,name=timeout,proto3" json:"timeout,omitempty"` } func (m *InFlightPacket) Reset() { *m = InFlightPacket{} } @@ -192,13 +191,6 @@ func (m *InFlightPacket) GetRefundSequence() uint64 { return 0 } -func (m *InFlightPacket) GetRefundDenom() string { - if m != nil { - return m.RefundDenom - } - return "" -} - func (m *InFlightPacket) GetRetriesRemaining() int32 { if m != nil { return m.RetriesRemaining @@ -223,42 +215,41 @@ func init() { func init() { proto.RegisterFile("router/v1/genesis.proto", fileDescriptor_4940b763c55c4e0b) } var fileDescriptor_4940b763c55c4e0b = []byte{ - // 553 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0xcf, 0x6e, 0xd3, 0x3e, - 0x1c, 0x6f, 0xba, 0xad, 0xd3, 0xbc, 0xfd, 0xf6, 0xc7, 0xda, 0xb4, 0xfc, 0x76, 0x48, 0x4b, 0x85, - 0xa0, 0x02, 0x9a, 0x68, 0x9b, 0x84, 0xd0, 0x6e, 0x94, 0xc1, 0xd4, 0x5b, 0x95, 0xdd, 0x90, 0x50, - 0xe4, 0xc5, 0xdf, 0x66, 0xd6, 0x12, 0x3b, 0xd8, 0x4e, 0x46, 0x79, 0x0a, 0xce, 0xbc, 0x03, 0xef, - 0xb1, 0xe3, 0x8e, 0x88, 0x43, 0x85, 0xb6, 0x37, 0xd8, 0x13, 0xa0, 0xd8, 0x29, 0xb4, 0x82, 0x53, - 0xed, 0xcf, 0x3f, 0x7f, 0x3f, 0x75, 0x8c, 0xf6, 0xa5, 0x28, 0x34, 0xc8, 0xa0, 0x3c, 0x0c, 0x12, - 0xe0, 0xa0, 0x98, 0xf2, 0x73, 0x29, 0xb4, 0xc0, 0x6b, 0x96, 0xf0, 0xcb, 0xc3, 0x83, 0xdd, 0x44, - 0x24, 0xc2, 0xa0, 0x41, 0xb5, 0xb2, 0x82, 0xee, 0xd7, 0x26, 0xda, 0x38, 0xb3, 0x96, 0x73, 0x4d, - 0x34, 0xe0, 0x00, 0xb5, 0x72, 0x22, 0x49, 0xa6, 0x5c, 0xa7, 0xe3, 0xf4, 0xd6, 0x8f, 0x76, 0xfc, - 0xdf, 0x11, 0xfe, 0xc8, 0x10, 0x83, 0xe5, 0x9b, 0x69, 0xbb, 0x11, 0xd6, 0x32, 0xfc, 0x19, 0xed, - 0x30, 0x1e, 0x8d, 0x53, 0x96, 0x5c, 0xea, 0x28, 0x27, 0xf1, 0x15, 0x68, 0xe5, 0x36, 0x3b, 0x4b, - 0xbd, 0xf5, 0xa3, 0x17, 0x73, 0xde, 0xf9, 0x43, 0xfc, 0x21, 0x7f, 0x67, 0xf4, 0x23, 0x2b, 0x7f, - 0xcb, 0xb5, 0x9c, 0x0c, 0x3a, 0x55, 0xec, 0xc3, 0xb4, 0xed, 0x4e, 0x48, 0x96, 0x9e, 0x74, 0xff, - 0x0a, 0xed, 0x86, 0x5b, 0x6c, 0xd1, 0x77, 0xf0, 0x01, 0xed, 0xfe, 0x2b, 0x0a, 0x6f, 0xa3, 0xa5, - 0x2b, 0x98, 0x98, 0x06, 0x6b, 0x61, 0xb5, 0xc4, 0x01, 0x5a, 0x29, 0x49, 0x5a, 0x80, 0xdb, 0x34, - 0xad, 0xfe, 0x9f, 0x9b, 0x6c, 0x31, 0x21, 0xb4, 0xba, 0x93, 0xe6, 0x2b, 0xa7, 0xfb, 0x09, 0xb5, - 0x6c, 0x65, 0xcc, 0xd1, 0xe6, 0x18, 0x20, 0xca, 0x41, 0xc6, 0xc0, 0x35, 0x49, 0xc0, 0x66, 0x0f, - 0xce, 0xaa, 0x99, 0x7f, 0x4c, 0xdb, 0x4f, 0x12, 0xa6, 0x2f, 0x8b, 0x0b, 0x3f, 0x16, 0x59, 0x10, - 0x0b, 0x95, 0x09, 0x55, 0xff, 0xf4, 0x15, 0xbd, 0x0a, 0xf4, 0x24, 0x07, 0xe5, 0x9f, 0x42, 0xfc, - 0x30, 0x6d, 0xef, 0xd9, 0x76, 0x8b, 0x69, 0xdd, 0xf0, 0xbf, 0x31, 0xc0, 0xe8, 0xcf, 0xfe, 0x5b, - 0x13, 0x6d, 0x2e, 0xce, 0x85, 0x5f, 0xa2, 0x7d, 0x21, 0x59, 0xc2, 0x38, 0x49, 0x23, 0x05, 0x9c, - 0x82, 0x8c, 0x08, 0xa5, 0x12, 0x94, 0xaa, 0x7b, 0xee, 0xcd, 0xe8, 0x73, 0xc3, 0xbe, 0xb6, 0x24, - 0x7e, 0x86, 0x76, 0x24, 0x8c, 0x0b, 0x4e, 0xa3, 0xf8, 0x92, 0x70, 0x0e, 0x69, 0xc4, 0xa8, 0xf9, - 0x17, 0xd6, 0xc2, 0x2d, 0x4b, 0xbc, 0xb1, 0xf8, 0x90, 0xe2, 0xc7, 0x68, 0xb3, 0xd6, 0xe6, 0x42, - 0xea, 0x4a, 0xb8, 0x64, 0x84, 0x1b, 0x16, 0x1d, 0x09, 0xa9, 0x87, 0x14, 0x3f, 0x45, 0xb5, 0x31, - 0x52, 0xf0, 0xb1, 0x00, 0x1e, 0x83, 0xbb, 0xdc, 0x71, 0x7a, 0xcb, 0x61, 0x6d, 0x3e, 0xaf, 0x51, - 0xfc, 0x08, 0xd5, 0xc6, 0x88, 0x02, 0x17, 0x99, 0xbb, 0x62, 0xc2, 0xd6, 0x2d, 0x76, 0x5a, 0x41, - 0xf8, 0x79, 0x35, 0x9d, 0x96, 0x0c, 0x54, 0x24, 0x21, 0x23, 0x8c, 0x33, 0x9e, 0xb8, 0xad, 0x8e, - 0xd3, 0x5b, 0x09, 0xb7, 0x6b, 0x22, 0x9c, 0xe1, 0xd8, 0x45, 0xab, 0x9a, 0x65, 0x20, 0x0a, 0xed, - 0xae, 0x9a, 0x03, 0x67, 0xdb, 0x41, 0x7c, 0x73, 0xe7, 0x39, 0xb7, 0x77, 0x9e, 0xf3, 0xf3, 0xce, - 0x73, 0xbe, 0xdc, 0x7b, 0x8d, 0xdb, 0x7b, 0xaf, 0xf1, 0xfd, 0xde, 0x6b, 0xbc, 0x1f, 0xce, 0xdd, - 0x8c, 0xd2, 0x92, 0xf0, 0x04, 0x52, 0x51, 0x42, 0xbf, 0x04, 0xae, 0x0b, 0x09, 0x2a, 0xb0, 0x5f, - 0x57, 0x7f, 0x2c, 0xe4, 0x35, 0x91, 0xb4, 0x9f, 0x31, 0x4a, 0x53, 0xb8, 0x26, 0x12, 0x82, 0xf2, - 0x38, 0xa8, 0xdf, 0x95, 0xb9, 0xc0, 0x8b, 0x96, 0x79, 0x32, 0xc7, 0xbf, 0x02, 0x00, 0x00, 0xff, - 0xff, 0x62, 0xc8, 0x1b, 0x5a, 0x6e, 0x03, 0x00, 0x00, + // 534 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0xcd, 0x6e, 0xd3, 0x30, + 0x1c, 0x6f, 0xba, 0xb5, 0xa8, 0xde, 0xe8, 0x56, 0x6b, 0xd3, 0xc2, 0x0e, 0x69, 0x55, 0x21, 0xa8, + 0x80, 0x26, 0xda, 0x26, 0x21, 0xb4, 0x1b, 0xe5, 0x63, 0xea, 0xad, 0x4a, 0x6f, 0x48, 0x28, 0xf2, + 0x92, 0x7f, 0x53, 0xab, 0x89, 0x1d, 0x6c, 0x27, 0xa3, 0x3c, 0x02, 0x27, 0xce, 0x3c, 0xd1, 0x8e, + 0x3b, 0x22, 0x0e, 0x15, 0x6a, 0xdf, 0x60, 0x4f, 0x80, 0x12, 0xa7, 0xd0, 0x0a, 0x4e, 0xb5, 0x7f, + 0x5f, 0xfe, 0xff, 0xdc, 0x18, 0x9d, 0x08, 0x9e, 0x2a, 0x10, 0x4e, 0x76, 0xe6, 0x84, 0xc0, 0x40, + 0x52, 0x69, 0x27, 0x82, 0x2b, 0x8e, 0x1b, 0x9a, 0xb0, 0xb3, 0xb3, 0xd3, 0xa3, 0x90, 0x87, 0xbc, + 0x40, 0x9d, 0x7c, 0xa5, 0x05, 0xdd, 0xef, 0x55, 0xb4, 0x7f, 0xa5, 0x2d, 0x63, 0x45, 0x14, 0x60, + 0x07, 0xd5, 0x13, 0x22, 0x48, 0x2c, 0x4d, 0xa3, 0x63, 0xf4, 0xf6, 0xce, 0x5b, 0xf6, 0x9f, 0x08, + 0x7b, 0x54, 0x10, 0x83, 0xdd, 0xdb, 0x45, 0xbb, 0xe2, 0x96, 0x32, 0xfc, 0x05, 0xb5, 0x28, 0xf3, + 0x26, 0x11, 0x0d, 0xa7, 0xca, 0x4b, 0x88, 0x3f, 0x03, 0x25, 0xcd, 0x6a, 0x67, 0xa7, 0xb7, 0x77, + 0xfe, 0x62, 0xc3, 0xbb, 0x79, 0x88, 0x3d, 0x64, 0xef, 0x0b, 0xfd, 0x48, 0xcb, 0xdf, 0x31, 0x25, + 0xe6, 0x83, 0x4e, 0x1e, 0x7b, 0xbf, 0x68, 0x9b, 0x73, 0x12, 0x47, 0x97, 0xdd, 0x7f, 0x42, 0xbb, + 0xee, 0x01, 0xdd, 0xf6, 0x9d, 0x7e, 0x44, 0x47, 0xff, 0x8b, 0xc2, 0x87, 0x68, 0x67, 0x06, 0xf3, + 0xa2, 0x41, 0xc3, 0xcd, 0x97, 0xd8, 0x41, 0xb5, 0x8c, 0x44, 0x29, 0x98, 0xd5, 0xa2, 0xd5, 0xa3, + 0x8d, 0xc9, 0xb6, 0x13, 0x5c, 0xad, 0xbb, 0xac, 0xbe, 0x32, 0xba, 0x9f, 0x51, 0x5d, 0x57, 0xc6, + 0x0c, 0x35, 0x27, 0x00, 0x5e, 0x02, 0xc2, 0x07, 0xa6, 0x48, 0x08, 0x3a, 0x7b, 0x70, 0x95, 0xcf, + 0xfc, 0x73, 0xd1, 0x7e, 0x12, 0x52, 0x35, 0x4d, 0xaf, 0x6d, 0x9f, 0xc7, 0x8e, 0xcf, 0x65, 0xcc, + 0x65, 0xf9, 0xd3, 0x97, 0xc1, 0xcc, 0x51, 0xf3, 0x04, 0xa4, 0xfd, 0x16, 0xfc, 0xfb, 0x45, 0xfb, + 0x58, 0xb7, 0xdb, 0x4e, 0xeb, 0xba, 0x0f, 0x27, 0x00, 0xa3, 0xbf, 0xfb, 0xaf, 0x55, 0xd4, 0xdc, + 0x9e, 0x0b, 0xbf, 0x44, 0x27, 0x5c, 0xd0, 0x90, 0x32, 0x12, 0x79, 0x12, 0x58, 0x00, 0xc2, 0x23, + 0x41, 0x20, 0x40, 0xca, 0xb2, 0xe7, 0xf1, 0x9a, 0x1e, 0x17, 0xec, 0x6b, 0x4d, 0xe2, 0x67, 0xa8, + 0x25, 0x60, 0x92, 0xb2, 0xc0, 0xf3, 0xa7, 0x84, 0x31, 0x88, 0x3c, 0x1a, 0x14, 0xb7, 0xd0, 0x70, + 0x0f, 0x34, 0xf1, 0x46, 0xe3, 0xc3, 0x00, 0x3f, 0x46, 0xcd, 0x52, 0x9b, 0x70, 0xa1, 0x72, 0xe1, + 0x4e, 0x21, 0xdc, 0xd7, 0xe8, 0x88, 0x0b, 0x35, 0x0c, 0xf0, 0x53, 0x54, 0x1a, 0x3d, 0x09, 0x9f, + 0x52, 0x60, 0x3e, 0x98, 0xbb, 0x1d, 0xa3, 0xb7, 0xeb, 0x96, 0xe6, 0x71, 0x89, 0xe2, 0xe7, 0xf9, + 0xd1, 0x4a, 0x50, 0x90, 0x9e, 0x80, 0x98, 0x50, 0x46, 0x59, 0x68, 0xd6, 0x3a, 0x46, 0xaf, 0xe6, + 0x1e, 0x96, 0x84, 0xbb, 0xc6, 0xb1, 0x89, 0x1e, 0x28, 0x1a, 0x03, 0x4f, 0x95, 0x59, 0x2f, 0xd2, + 0xd6, 0xdb, 0x81, 0x7f, 0xbb, 0xb4, 0x8c, 0xbb, 0xa5, 0x65, 0xfc, 0x5a, 0x5a, 0xc6, 0xb7, 0x95, + 0x55, 0xb9, 0x5b, 0x59, 0x95, 0x1f, 0x2b, 0xab, 0xf2, 0x61, 0xb8, 0x71, 0xed, 0x52, 0x09, 0xc2, + 0x42, 0x88, 0x78, 0x06, 0xfd, 0x0c, 0x98, 0x4a, 0x05, 0x48, 0x47, 0x7f, 0x3a, 0xfd, 0x09, 0x17, + 0x37, 0x44, 0x04, 0xfd, 0x98, 0x06, 0x41, 0x04, 0x37, 0x44, 0x80, 0x93, 0x5d, 0x38, 0xe5, 0xa3, + 0x29, 0xfe, 0x9d, 0xeb, 0x7a, 0xf1, 0x1e, 0x2e, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0xe8, 0x07, + 0x62, 0x7b, 0x4b, 0x03, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -374,19 +365,12 @@ func (m *InFlightPacket) MarshalToSizedBuffer(dAtA []byte) (int, error) { if m.Timeout != 0 { i = encodeVarintGenesis(dAtA, i, uint64(m.Timeout)) i-- - dAtA[i] = 0x38 + dAtA[i] = 0x30 } if m.RetriesRemaining != 0 { i = encodeVarintGenesis(dAtA, i, uint64(m.RetriesRemaining)) i-- - dAtA[i] = 0x30 - } - if len(m.RefundDenom) > 0 { - i -= len(m.RefundDenom) - copy(dAtA[i:], m.RefundDenom) - i = encodeVarintGenesis(dAtA, i, uint64(len(m.RefundDenom))) - i-- - dAtA[i] = 0x2a + dAtA[i] = 0x28 } if m.RefundSequence != 0 { i = encodeVarintGenesis(dAtA, i, uint64(m.RefundSequence)) @@ -480,10 +464,6 @@ func (m *InFlightPacket) Size() (n int) { if m.RefundSequence != 0 { n += 1 + sovGenesis(uint64(m.RefundSequence)) } - l = len(m.RefundDenom) - if l > 0 { - n += 1 + l + sovGenesis(uint64(l)) - } if m.RetriesRemaining != 0 { n += 1 + sovGenesis(uint64(m.RetriesRemaining)) } @@ -940,38 +920,6 @@ func (m *InFlightPacket) Unmarshal(dAtA []byte) error { } } case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RefundDenom", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - 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 ErrInvalidLengthGenesis - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.RefundDenom = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 6: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field RetriesRemaining", wireType) } @@ -990,7 +938,7 @@ func (m *InFlightPacket) Unmarshal(dAtA []byte) error { break } } - case 7: + case 6: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Timeout", wireType) } From 97cc5e902dd92dc2e38f357ca328a1c48b7a32e6 Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Sun, 6 Nov 2022 12:03:25 -0700 Subject: [PATCH 19/24] Don't write acknowledgements until forwarded packet returns ack. Proxy acks back to source chain. --- proto/router/v1/genesis.proto | 15 +- router/keeper/keeper.go | 133 ++++-------- router/module.go | 161 +-------------- router/module_test.go | 67 ++++-- router/types/expected_keepers.go | 10 +- router/types/genesis.pb.go | 343 ++++++++++++++++++++++++++----- test/mock/channel_keeper.go | 35 +++- 7 files changed, 434 insertions(+), 330 deletions(-) diff --git a/proto/router/v1/genesis.proto b/proto/router/v1/genesis.proto index 5fbb23a..95d30a1 100644 --- a/proto/router/v1/genesis.proto +++ b/proto/router/v1/genesis.proto @@ -29,13 +29,18 @@ message Params { ]; } -// InFlightPacket contains information about original packet for refunding if -// necessary. +// InFlightPacket contains information about original packet for +// writing the acknowledgement and refunding if necessary. message InFlightPacket { string original_sender_address = 1; string refund_channel_id = 2; string refund_port_id = 3; - uint64 refund_sequence = 4; - int32 retries_remaining = 5; - uint64 timeout = 6; + string packet_src_channel_id = 4; + string packet_src_port_id = 5; + uint64 packet_timeout_timestamp = 6; + string packet_timeout_height = 7; + bytes packet_data = 8; + uint64 refund_sequence = 9; + int32 retries_remaining = 10; + uint64 timeout = 11; } diff --git a/router/keeper/keeper.go b/router/keeper/keeper.go index b05830e..0f6afdd 100644 --- a/router/keeper/keeper.go +++ b/router/keeper/keeper.go @@ -1,7 +1,6 @@ package keeper import ( - "encoding/json" "fmt" "time" @@ -38,13 +37,12 @@ type PacketMetadata struct { } type ForwardMetadata struct { - Receiver string `json:"receiver,omitempty"` - Port string `json:"port,omitempty"` - Channel string `json:"channel,omitempty"` - Timeout time.Duration `json:"timeout,omitempty"` - Retries *uint8 `json:"retries,omitempty"` - Next *string `json:"next,omitempty"` - RefundSequence *uint64 `json:"refund_sequence,omitempty"` + Receiver string `json:"receiver,omitempty"` + Port string `json:"port,omitempty"` + Channel string `json:"channel,omitempty"` + Timeout time.Duration `json:"timeout,omitempty"` + Retries *uint8 `json:"retries,omitempty"` + Next *string `json:"next,omitempty"` } func (m *ForwardMetadata) Validate() error { @@ -100,6 +98,36 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger { return ctx.Logger().With("module", "x/"+host.ModuleName+"-"+types.ModuleName) } +func (k Keeper) WriteAcknowledgementForForwardedPacket( + ctx sdk.Context, + sequence uint64, + port, channel string, + ack channeltypes.Acknowledgement, +) error { + inFlightPacket := k.GetAndClearInFlightPacket(ctx, channel, port, sequence) + if inFlightPacket == nil { + // not a forwarded packet + return nil + } + + // Lookup module by channel capability + _, cap, err := k.channelKeeper.LookupModuleByChannel(ctx, inFlightPacket.RefundPortId, inFlightPacket.RefundChannelId) + if err != nil { + return sdkerrors.Wrap(err, "could not retrieve module from port-id") + } + + return k.channelKeeper.WriteAcknowledgement(ctx, cap, channeltypes.Packet{ + Data: inFlightPacket.PacketData, + Sequence: inFlightPacket.RefundSequence, + SourcePort: inFlightPacket.PacketSrcPortId, + SourceChannel: inFlightPacket.PacketSrcChannelId, + DestinationPort: inFlightPacket.RefundPortId, + DestinationChannel: inFlightPacket.RefundChannelId, + TimeoutHeight: clienttypes.MustParseHeight(inFlightPacket.PacketTimeoutHeight), + TimeoutTimestamp: inFlightPacket.PacketTimeoutTimestamp, + }, ack) +} + func (k Keeper) ForwardTransferPacket( ctx sdk.Context, inFlightPacket *types.InFlightPacket, @@ -179,8 +207,9 @@ func (k Keeper) ForwardTransferPacket( RefundChannelId: srcPacket.DestinationChannel, RefundPortId: srcPacket.DestinationPort, RefundSequence: srcPacket.Sequence, - RetriesRemaining: int32(maxRetries), - Timeout: uint64(timeout.Nanoseconds()), + + RetriesRemaining: int32(maxRetries), + Timeout: uint64(timeout.Nanoseconds()), } } else { inFlightPacket.RetriesRemaining-- @@ -326,87 +355,3 @@ func (k Keeper) GetAndClearInFlightPacket( k.cdc.MustUnmarshal(bz, &inFlightPacket) return &inFlightPacket } - -func (k Keeper) RefundForwardedPacket( - ctx sdk.Context, - channel string, - port string, - refundSequence uint64, - sender string, - receiver string, - token sdk.Coin, - timeout time.Duration, -) { - feeAmount := sdk.NewDecFromInt(token.Amount).Mul(k.GetFeePercentage(ctx)).RoundInt() - packetAmount := token.Amount.Sub(feeAmount) - feeCoins := sdk.Coins{sdk.NewCoin(token.Denom, feeAmount)} - packetCoin := sdk.NewCoin(token.Denom, packetAmount) - - // pay fees - if feeAmount.IsPositive() { - hostAccAddr, err := sdk.AccAddressFromBech32(receiver) - if err != nil { - return - } - err = k.distrKeeper.FundCommunityPool(ctx, feeCoins, hostAccAddr) - if err != nil { - k.Logger(ctx).Error("packetForwardMiddleware error funding community pool", - "error", err, - ) - return - } - } - - msgTransfer := transfertypes.NewMsgTransfer( - port, - channel, - packetCoin, - sender, - receiver, - DefaultTransferPacketTimeoutHeight, - uint64(ctx.BlockTime().UnixNano())+uint64(timeout.Nanoseconds()), - ) - - packetMemo := &PacketMetadata{ - Forward: &ForwardMetadata{ - RefundSequence: &refundSequence, - }, - } - - memo, err := json.Marshal(packetMemo) - if err != nil { - k.Logger(ctx).Error("packetForwardMiddleware error marshaling json for multi-hop refund sequence", - "refund-sequence", refundSequence, - "channel-id", channel, "port-id", port, - "sender", sender, "receiver", receiver, - "amount", packetCoin.Amount, "denom", packetCoin.Denom, - "error", err, - ) - return - } - - msgTransfer.Memo = string(memo) - - k.Logger(ctx).Debug("packetForwardMiddleware RefundForwardedPacket", - "refund-sequence", refundSequence, - "channel-id", channel, "port-id", port, - "sender", sender, "receiver", receiver, - "amount", packetCoin.Amount, "denom", packetCoin.Denom, - ) - - if _, err := k.transferKeeper.Transfer( - sdk.WrapSDKContext(ctx), - msgTransfer, - ); err != nil { - k.Logger(ctx).Error("packetForwardMiddleware error sending packet transfer for multi-hop refund", - "channel-id", channel, - "port-id", port, - "sender", sender, - "receiver", receiver, - "refund-sequence", refundSequence, - "amount", token.Amount, - "denom", token.Denom, - "error", err, - ) - } -} diff --git a/router/module.go b/router/module.go index 63c821c..47f928a 100644 --- a/router/module.go +++ b/router/module.go @@ -267,64 +267,12 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re metadata := m.Forward - if m.Forward.RefundSequence != nil { - am.keeper.Logger(ctx).Debug("packetForwardMiddleware RefundSequence exists") - ack := am.app.OnRecvPacket(ctx, packet, relayer) - if !ack.Success() { - am.keeper.Logger(ctx).Error("packetForwardMiddleware RefundSequence exists but ack failed") - return ack - } - - inFlightPacket := am.keeper.GetAndClearInFlightPacket(ctx, packet.DestinationChannel, packet.DestinationPort, *m.Forward.RefundSequence) - if inFlightPacket == nil { - am.keeper.Logger(ctx).Error("packetForwardMiddleware RefundSequence exists but inFlightPacket is nil") - // this is either not a forwarded packet, or it is the final destination for the refund. - return nil - } - - denomOnThisChain := GetDenomForThisChain( - packet.SourcePort, packet.SourceChannel, - packet.DestinationPort, packet.DestinationChannel, - data.Denom, - ) - - amountInt, ok := sdk.NewIntFromString(data.Amount) - if !ok { - am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing amount for refund", - "sequence", packet.Sequence, - "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, - "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, - "amount", data.Amount, "denom", data.Denom, - "error", err, - ) - return nil - } - - am.keeper.Logger(ctx).Debug("packetForwardMiddleware RefundForwardedPacket from OnRecvPacket", - "sequence", packet.Sequence, - "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, - "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, - "amount", data.Amount, - "raw_denom", data.Denom, "denom_on_this_chain", denomOnThisChain, - ) - - // pass along refund to previous hop in multi-hop. - am.keeper.RefundForwardedPacket( - ctx, - inFlightPacket.RefundChannelId, inFlightPacket.RefundPortId, inFlightPacket.RefundSequence, - data.Receiver, inFlightPacket.OriginalSenderAddress, - sdk.NewCoin(denomOnThisChain, amountInt), - am.refundTimeout, - ) - return nil - } - if err := metadata.Validate(); err != nil { return channeltypes.NewErrorAcknowledgement(err.Error()) } ack := am.app.OnRecvPacket(ctx, packet, relayer) - if !ack.Success() { + if ack == nil || !ack.Success() { return ack } @@ -357,11 +305,12 @@ func (am AppModule) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, re err = am.keeper.ForwardTransferPacket(ctx, nil, packet, data.Sender, data.Receiver, metadata, token, retries, timeout, []metrics.Label{}) if err != nil { - // Don't think this is needed since ack error will issue refund on previous chain. - // am.keeper.RefundForwardedPacket(ctx, packet.DestinationChannel, packet.DestinationPort, packet.Sequence, data.Receiver, data.Sender, token, am.refundTimeout) - ack = channeltypes.NewErrorAcknowledgement(err.Error()) + return channeltypes.NewErrorAcknowledgement(err.Error()) } - return ack + + // returning nil ack will prevent WriteAcknowledgement from occurring for forwarded packet. + // This is intentional so that the acknowledgement will be written later based on the ack/timeout of the forwarded packet. + return nil } // OnAcknowledgementPacket implements the IBCModule interface @@ -393,59 +342,8 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes return sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-20 transfer packet acknowledgement: %v", err) } - if !ack.Success() { - // If acknowledgement indicates error, no retries should be attempted. Refund will be initiated now. - inFlightPacket := am.keeper.GetAndClearInFlightPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence) - if inFlightPacket == nil { - return nil - } - - amount, ok := sdk.NewIntFromString(data.Amount) - if !ok { - am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing amount from string for refund on ack", - "sequence", packet.Sequence, - "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, - "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, - "amount", data.Amount, - ) - return nil - } - - denom := data.Denom - denomTrace := transfertypes.ParseDenomTrace(data.Denom) - if denomTrace.Path != "" { - denom = denomTrace.IBCDenom() - } - - am.keeper.Logger(ctx).Debug("packetForwardMiddleware RefundForwardedPacket from OnAcknowledgementPacket", - "sequence", packet.Sequence, - "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, - "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, - "amount", data.Amount, - "raw_denom", data.Denom, "denom_on_this_chain", denom, - ) - - am.keeper.RefundForwardedPacket( - ctx, - inFlightPacket.RefundChannelId, - inFlightPacket.RefundPortId, - inFlightPacket.RefundSequence, - data.Sender, - inFlightPacket.OriginalSenderAddress, - sdk.NewCoin(denom, amount), - am.refundTimeout, - ) - return nil - } - - // TODO: this assumption no longer works, because multi-hop refunds depend - // on the InFlightPacket being in the store on previous chains. Need to find a better way to cleanup InFlightPackets, - // or curry into Next metadata so that the entire refund path can be re-created. - - // For successful ack, we no longer need to track this packet. - // am.keeper.RemoveInFlightPacket(ctx, packet) - - return nil + // WriteAcknowledgement with proxied ack to return success/fail to previous chain. + return am.keeper.WriteAcknowledgementForForwardedPacket(ctx, packet.Sequence, packet.SourcePort, packet.SourceChannel, ack) } // OnTimeoutPacket implements the IBCModule interface @@ -473,47 +371,8 @@ func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, } if err := am.keeper.HandleTimeout(ctx, packet); err != nil { - inFlightPacket := am.keeper.GetAndClearInFlightPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence) - if inFlightPacket == nil { - return nil - } - - amount, ok := sdk.NewIntFromString(data.Amount) - if !ok { - am.keeper.Logger(ctx).Error("packetForwardMiddleware error parsing amount from string for refund on timeout", - "sequence", packet.Sequence, - "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, - "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, - "amount", data.Amount, - ) - return nil - } - - denom := data.Denom - denomTrace := transfertypes.ParseDenomTrace(data.Denom) - if denomTrace.Path != "" { - denom = denomTrace.IBCDenom() - } - - am.keeper.Logger(ctx).Debug("packetForwardMiddleware RefundForwardedPacket from OnTimeoutPacket", - "sequence", packet.Sequence, - "src-channel", packet.SourceChannel, "src-port", packet.SourcePort, - "dst-channel", packet.DestinationChannel, "dst-port", packet.DestinationPort, - "amount", data.Amount, - "raw_denom", data.Denom, "denom", denom, - ) - - am.keeper.RefundForwardedPacket( - ctx, - inFlightPacket.RefundChannelId, - inFlightPacket.RefundPortId, - inFlightPacket.RefundSequence, - data.Sender, - inFlightPacket.OriginalSenderAddress, - sdk.NewCoin(denom, amount), - am.refundTimeout, - ) - return nil + // WriteAcknowledgement with proxied ack to return success/fail to previous chain. + return am.keeper.WriteAcknowledgementForForwardedPacket(ctx, packet.Sequence, packet.SourcePort, packet.SourceChannel, channeltypes.NewErrorAcknowledgement(err.Error())) } return nil diff --git a/router/module_test.go b/router/module_test.go index 160f497..bc6d09e 100644 --- a/router/module_test.go +++ b/router/module_test.go @@ -184,11 +184,15 @@ func TestOnRecvPacket_ForwardNoFee(t *testing.T) { Channel: channel, }, }) + packetFwd := transferPacket(t, destAddr, nil) + + acknowledgement := channeltypes.NewResultAcknowledgement([]byte("test")) + successAck := cdc.MustMarshalJSON(&acknowledgement) // Expected mocks gomock.InOrder( setup.Mocks.IBCModuleMock.EXPECT().OnRecvPacket(ctx, packetOrig, senderAccAddr). - Return(channeltypes.NewResultAcknowledgement([]byte("test"))), + Return(acknowledgement), setup.Mocks.TransferKeeperMock.EXPECT().Transfer( sdk.WrapSDKContext(ctx), @@ -202,15 +206,18 @@ func TestOnRecvPacket_ForwardNoFee(t *testing.T) { uint64(ctx.BlockTime().UnixNano())+uint64(keeper.DefaultForwardTransferPacketTimeoutTimestamp.Nanoseconds()), ), ).Return(&apptypes.MsgTransferResponse{Sequence: 0}, nil), + + setup.Mocks.IBCModuleMock.EXPECT().OnAcknowledgementPacket(ctx, packetFwd, successAck, senderAccAddr). + Return(nil), ) + // chain B with router module receives packet and forwards. ack should be nil so that it is not written yet. ack := routerModule.OnRecvPacket(ctx, packetOrig, senderAccAddr) - require.True(t, ack.Success()) + require.Nil(t, ack) - expectedAck := &channeltypes.Acknowledgement{} - err = cdc.UnmarshalJSON(ack.Acknowledgement(), expectedAck) + // ack returned from chain C + err = routerModule.OnAcknowledgementPacket(ctx, packetFwd, successAck, senderAccAddr) require.NoError(t, err) - require.Equal(t, "test", string(expectedAck.GetResult())) } func TestOnRecvPacket_ForwardWithFee(t *testing.T) { @@ -242,11 +249,14 @@ func TestOnRecvPacket_ForwardWithFee(t *testing.T) { Channel: channel, }, }) + packetFwd := transferPacket(t, destAddr, nil) + acknowledgement := channeltypes.NewResultAcknowledgement([]byte("test")) + successAck := cdc.MustMarshalJSON(&acknowledgement) // Expected mocks gomock.InOrder( setup.Mocks.IBCModuleMock.EXPECT().OnRecvPacket(ctx, packetOrig, senderAccAddr). - Return(channeltypes.NewResultAcknowledgement([]byte("test"))), + Return(acknowledgement), setup.Mocks.DistributionKeeperMock.EXPECT().FundCommunityPool( ctx, @@ -266,15 +276,18 @@ func TestOnRecvPacket_ForwardWithFee(t *testing.T) { uint64(ctx.BlockTime().UnixNano())+uint64(keeper.DefaultForwardTransferPacketTimeoutTimestamp.Nanoseconds()), ), ).Return(&apptypes.MsgTransferResponse{Sequence: 0}, nil), + + setup.Mocks.IBCModuleMock.EXPECT().OnAcknowledgementPacket(ctx, packetFwd, successAck, senderAccAddr). + Return(nil), ) + // chain B with router module receives packet and forwards. ack should be nil so that it is not written yet. ack := routerModule.OnRecvPacket(ctx, packetOrig, senderAccAddr) - require.True(t, ack.Success()) + require.Nil(t, ack) - expectedAck := &channeltypes.Acknowledgement{} - err = cdc.UnmarshalJSON(ack.Acknowledgement(), expectedAck) + // ack returned from chain C + err = routerModule.OnAcknowledgementPacket(ctx, packetFwd, successAck, senderAccAddr) require.NoError(t, err) - require.Equal(t, "test", string(expectedAck.GetResult())) } func TestOnRecvPacket_ForwardMultihop(t *testing.T) { @@ -318,6 +331,7 @@ func TestOnRecvPacket_ForwardMultihop(t *testing.T) { }, }) packet2 := transferPacket(t, hostAddr2, nextMetadata) + packetFwd := transferPacket(t, destAddr, nil) msgTransfer1 := transfertypes.NewMsgTransfer( port, @@ -343,10 +357,13 @@ func TestOnRecvPacket_ForwardMultihop(t *testing.T) { ) // no memo on final forward + acknowledgement := channeltypes.NewResultAcknowledgement([]byte("test")) + successAck := cdc.MustMarshalJSON(&acknowledgement) + // Expected mocks gomock.InOrder( setup.Mocks.IBCModuleMock.EXPECT().OnRecvPacket(ctx, packetOrig, senderAccAddr). - Return(channeltypes.NewResultAcknowledgement([]byte("test"))), + Return(acknowledgement), setup.Mocks.TransferKeeperMock.EXPECT().Transfer( sdk.WrapSDKContext(ctx), @@ -354,27 +371,33 @@ func TestOnRecvPacket_ForwardMultihop(t *testing.T) { ).Return(&apptypes.MsgTransferResponse{Sequence: 0}, nil), setup.Mocks.IBCModuleMock.EXPECT().OnRecvPacket(ctx, packet2, senderAccAddr2). - Return(channeltypes.NewResultAcknowledgement([]byte("test"))), + Return(acknowledgement), setup.Mocks.TransferKeeperMock.EXPECT().Transfer( sdk.WrapSDKContext(ctx), msgTransfer2, ).Return(&apptypes.MsgTransferResponse{Sequence: 0}, nil), + + setup.Mocks.IBCModuleMock.EXPECT().OnAcknowledgementPacket(ctx, packetFwd, successAck, senderAccAddr2). + Return(nil), + + setup.Mocks.IBCModuleMock.EXPECT().OnAcknowledgementPacket(ctx, packet2, successAck, senderAccAddr). + Return(nil), ) + // chain B with router module receives packet and forwards. ack should be nil so that it is not written yet. ack := routerModule.OnRecvPacket(ctx, packetOrig, senderAccAddr) - require.True(t, ack.Success()) + require.Nil(t, ack) - expectedAck := &channeltypes.Acknowledgement{} - err = cdc.UnmarshalJSON(ack.Acknowledgement(), expectedAck) - require.NoError(t, err) - require.Equal(t, "test", string(expectedAck.GetResult())) + // chain C with router module receives packet and forwards. ack should be nil so that it is not written yet. + ack = routerModule.OnRecvPacket(ctx, packet2, senderAccAddr2) + require.Nil(t, ack) - ack2 := routerModule.OnRecvPacket(ctx, packet2, senderAccAddr2) - require.True(t, ack2.Success()) + // ack returned from chain D to chain C + err = routerModule.OnAcknowledgementPacket(ctx, packetFwd, successAck, senderAccAddr2) + require.NoError(t, err) - expectedAck2 := &channeltypes.Acknowledgement{} - err = cdc.UnmarshalJSON(ack2.Acknowledgement(), expectedAck2) + // ack returned from chain C to chain B + err = routerModule.OnAcknowledgementPacket(ctx, packet2, successAck, senderAccAddr) require.NoError(t, err) - require.Equal(t, "test", string(expectedAck2.GetResult())) } diff --git a/router/types/expected_keepers.go b/router/types/expected_keepers.go index 1c6bf02..887c3b6 100644 --- a/router/types/expected_keepers.go +++ b/router/types/expected_keepers.go @@ -4,7 +4,9 @@ import ( context "context" sdk "github.com/cosmos/cosmos-sdk/types" + capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" + "github.com/cosmos/ibc-go/v3/modules/core/exported" ) // TransferKeeper defines the expected transfer keeper @@ -14,7 +16,13 @@ type TransferKeeper interface { // ChannelKeeper defines the expected IBC channel keeper type ChannelKeeper interface { - GetNextSequenceSend(ctx sdk.Context, portID, channelID string) (uint64, bool) + LookupModuleByChannel(ctx sdk.Context, portID, channelID string) (string, *capabilitytypes.Capability, error) + WriteAcknowledgement( + ctx sdk.Context, + chanCap *capabilitytypes.Capability, + packet exported.PacketI, + ack exported.Acknowledgement, + ) error } // DistributionKeeper defines the expected distribution keeper diff --git a/router/types/genesis.pb.go b/router/types/genesis.pb.go index 0ed5c50..0e93ff9 100644 --- a/router/types/genesis.pb.go +++ b/router/types/genesis.pb.go @@ -119,15 +119,20 @@ func (m *Params) XXX_DiscardUnknown() { var xxx_messageInfo_Params proto.InternalMessageInfo -// InFlightPacket contains information about original packet for refunding if -// necessary. +// InFlightPacket contains information about original packet for +// writing the acknowledgement and refunding if necessary. type InFlightPacket struct { - OriginalSenderAddress string `protobuf:"bytes,1,opt,name=original_sender_address,json=originalSenderAddress,proto3" json:"original_sender_address,omitempty"` - RefundChannelId string `protobuf:"bytes,2,opt,name=refund_channel_id,json=refundChannelId,proto3" json:"refund_channel_id,omitempty"` - RefundPortId string `protobuf:"bytes,3,opt,name=refund_port_id,json=refundPortId,proto3" json:"refund_port_id,omitempty"` - RefundSequence uint64 `protobuf:"varint,4,opt,name=refund_sequence,json=refundSequence,proto3" json:"refund_sequence,omitempty"` - RetriesRemaining int32 `protobuf:"varint,5,opt,name=retries_remaining,json=retriesRemaining,proto3" json:"retries_remaining,omitempty"` - Timeout uint64 `protobuf:"varint,6,opt,name=timeout,proto3" json:"timeout,omitempty"` + OriginalSenderAddress string `protobuf:"bytes,1,opt,name=original_sender_address,json=originalSenderAddress,proto3" json:"original_sender_address,omitempty"` + RefundChannelId string `protobuf:"bytes,2,opt,name=refund_channel_id,json=refundChannelId,proto3" json:"refund_channel_id,omitempty"` + RefundPortId string `protobuf:"bytes,3,opt,name=refund_port_id,json=refundPortId,proto3" json:"refund_port_id,omitempty"` + PacketSrcChannelId string `protobuf:"bytes,4,opt,name=packet_src_channel_id,json=packetSrcChannelId,proto3" json:"packet_src_channel_id,omitempty"` + PacketSrcPortId string `protobuf:"bytes,5,opt,name=packet_src_port_id,json=packetSrcPortId,proto3" json:"packet_src_port_id,omitempty"` + PacketTimeoutTimestamp uint64 `protobuf:"varint,6,opt,name=packet_timeout_timestamp,json=packetTimeoutTimestamp,proto3" json:"packet_timeout_timestamp,omitempty"` + PacketTimeoutHeight string `protobuf:"bytes,7,opt,name=packet_timeout_height,json=packetTimeoutHeight,proto3" json:"packet_timeout_height,omitempty"` + PacketData []byte `protobuf:"bytes,8,opt,name=packet_data,json=packetData,proto3" json:"packet_data,omitempty"` + RefundSequence uint64 `protobuf:"varint,9,opt,name=refund_sequence,json=refundSequence,proto3" json:"refund_sequence,omitempty"` + RetriesRemaining int32 `protobuf:"varint,10,opt,name=retries_remaining,json=retriesRemaining,proto3" json:"retries_remaining,omitempty"` + Timeout uint64 `protobuf:"varint,11,opt,name=timeout,proto3" json:"timeout,omitempty"` } func (m *InFlightPacket) Reset() { *m = InFlightPacket{} } @@ -184,6 +189,41 @@ func (m *InFlightPacket) GetRefundPortId() string { return "" } +func (m *InFlightPacket) GetPacketSrcChannelId() string { + if m != nil { + return m.PacketSrcChannelId + } + return "" +} + +func (m *InFlightPacket) GetPacketSrcPortId() string { + if m != nil { + return m.PacketSrcPortId + } + return "" +} + +func (m *InFlightPacket) GetPacketTimeoutTimestamp() uint64 { + if m != nil { + return m.PacketTimeoutTimestamp + } + return 0 +} + +func (m *InFlightPacket) GetPacketTimeoutHeight() string { + if m != nil { + return m.PacketTimeoutHeight + } + return "" +} + +func (m *InFlightPacket) GetPacketData() []byte { + if m != nil { + return m.PacketData + } + return nil +} + func (m *InFlightPacket) GetRefundSequence() uint64 { if m != nil { return m.RefundSequence @@ -215,41 +255,47 @@ func init() { func init() { proto.RegisterFile("router/v1/genesis.proto", fileDescriptor_4940b763c55c4e0b) } var fileDescriptor_4940b763c55c4e0b = []byte{ - // 534 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0xcd, 0x6e, 0xd3, 0x30, - 0x1c, 0x6f, 0xba, 0xb5, 0xa8, 0xde, 0xe8, 0x56, 0x6b, 0xd3, 0xc2, 0x0e, 0x69, 0x55, 0x21, 0xa8, - 0x80, 0x26, 0xda, 0x26, 0x21, 0xb4, 0x1b, 0xe5, 0x63, 0xea, 0xad, 0x4a, 0x6f, 0x48, 0x28, 0xf2, - 0x92, 0x7f, 0x53, 0xab, 0x89, 0x1d, 0x6c, 0x27, 0xa3, 0x3c, 0x02, 0x27, 0xce, 0x3c, 0xd1, 0x8e, - 0x3b, 0x22, 0x0e, 0x15, 0x6a, 0xdf, 0x60, 0x4f, 0x80, 0x12, 0xa7, 0xd0, 0x0a, 0x4e, 0xb5, 0x7f, - 0x5f, 0xfe, 0xff, 0xdc, 0x18, 0x9d, 0x08, 0x9e, 0x2a, 0x10, 0x4e, 0x76, 0xe6, 0x84, 0xc0, 0x40, - 0x52, 0x69, 0x27, 0x82, 0x2b, 0x8e, 0x1b, 0x9a, 0xb0, 0xb3, 0xb3, 0xd3, 0xa3, 0x90, 0x87, 0xbc, - 0x40, 0x9d, 0x7c, 0xa5, 0x05, 0xdd, 0xef, 0x55, 0xb4, 0x7f, 0xa5, 0x2d, 0x63, 0x45, 0x14, 0x60, - 0x07, 0xd5, 0x13, 0x22, 0x48, 0x2c, 0x4d, 0xa3, 0x63, 0xf4, 0xf6, 0xce, 0x5b, 0xf6, 0x9f, 0x08, - 0x7b, 0x54, 0x10, 0x83, 0xdd, 0xdb, 0x45, 0xbb, 0xe2, 0x96, 0x32, 0xfc, 0x05, 0xb5, 0x28, 0xf3, - 0x26, 0x11, 0x0d, 0xa7, 0xca, 0x4b, 0x88, 0x3f, 0x03, 0x25, 0xcd, 0x6a, 0x67, 0xa7, 0xb7, 0x77, - 0xfe, 0x62, 0xc3, 0xbb, 0x79, 0x88, 0x3d, 0x64, 0xef, 0x0b, 0xfd, 0x48, 0xcb, 0xdf, 0x31, 0x25, - 0xe6, 0x83, 0x4e, 0x1e, 0x7b, 0xbf, 0x68, 0x9b, 0x73, 0x12, 0x47, 0x97, 0xdd, 0x7f, 0x42, 0xbb, - 0xee, 0x01, 0xdd, 0xf6, 0x9d, 0x7e, 0x44, 0x47, 0xff, 0x8b, 0xc2, 0x87, 0x68, 0x67, 0x06, 0xf3, - 0xa2, 0x41, 0xc3, 0xcd, 0x97, 0xd8, 0x41, 0xb5, 0x8c, 0x44, 0x29, 0x98, 0xd5, 0xa2, 0xd5, 0xa3, - 0x8d, 0xc9, 0xb6, 0x13, 0x5c, 0xad, 0xbb, 0xac, 0xbe, 0x32, 0xba, 0x9f, 0x51, 0x5d, 0x57, 0xc6, - 0x0c, 0x35, 0x27, 0x00, 0x5e, 0x02, 0xc2, 0x07, 0xa6, 0x48, 0x08, 0x3a, 0x7b, 0x70, 0x95, 0xcf, - 0xfc, 0x73, 0xd1, 0x7e, 0x12, 0x52, 0x35, 0x4d, 0xaf, 0x6d, 0x9f, 0xc7, 0x8e, 0xcf, 0x65, 0xcc, - 0x65, 0xf9, 0xd3, 0x97, 0xc1, 0xcc, 0x51, 0xf3, 0x04, 0xa4, 0xfd, 0x16, 0xfc, 0xfb, 0x45, 0xfb, - 0x58, 0xb7, 0xdb, 0x4e, 0xeb, 0xba, 0x0f, 0x27, 0x00, 0xa3, 0xbf, 0xfb, 0xaf, 0x55, 0xd4, 0xdc, - 0x9e, 0x0b, 0xbf, 0x44, 0x27, 0x5c, 0xd0, 0x90, 0x32, 0x12, 0x79, 0x12, 0x58, 0x00, 0xc2, 0x23, - 0x41, 0x20, 0x40, 0xca, 0xb2, 0xe7, 0xf1, 0x9a, 0x1e, 0x17, 0xec, 0x6b, 0x4d, 0xe2, 0x67, 0xa8, - 0x25, 0x60, 0x92, 0xb2, 0xc0, 0xf3, 0xa7, 0x84, 0x31, 0x88, 0x3c, 0x1a, 0x14, 0xb7, 0xd0, 0x70, - 0x0f, 0x34, 0xf1, 0x46, 0xe3, 0xc3, 0x00, 0x3f, 0x46, 0xcd, 0x52, 0x9b, 0x70, 0xa1, 0x72, 0xe1, - 0x4e, 0x21, 0xdc, 0xd7, 0xe8, 0x88, 0x0b, 0x35, 0x0c, 0xf0, 0x53, 0x54, 0x1a, 0x3d, 0x09, 0x9f, - 0x52, 0x60, 0x3e, 0x98, 0xbb, 0x1d, 0xa3, 0xb7, 0xeb, 0x96, 0xe6, 0x71, 0x89, 0xe2, 0xe7, 0xf9, - 0xd1, 0x4a, 0x50, 0x90, 0x9e, 0x80, 0x98, 0x50, 0x46, 0x59, 0x68, 0xd6, 0x3a, 0x46, 0xaf, 0xe6, - 0x1e, 0x96, 0x84, 0xbb, 0xc6, 0xb1, 0x89, 0x1e, 0x28, 0x1a, 0x03, 0x4f, 0x95, 0x59, 0x2f, 0xd2, - 0xd6, 0xdb, 0x81, 0x7f, 0xbb, 0xb4, 0x8c, 0xbb, 0xa5, 0x65, 0xfc, 0x5a, 0x5a, 0xc6, 0xb7, 0x95, - 0x55, 0xb9, 0x5b, 0x59, 0x95, 0x1f, 0x2b, 0xab, 0xf2, 0x61, 0xb8, 0x71, 0xed, 0x52, 0x09, 0xc2, - 0x42, 0x88, 0x78, 0x06, 0xfd, 0x0c, 0x98, 0x4a, 0x05, 0x48, 0x47, 0x7f, 0x3a, 0xfd, 0x09, 0x17, - 0x37, 0x44, 0x04, 0xfd, 0x98, 0x06, 0x41, 0x04, 0x37, 0x44, 0x80, 0x93, 0x5d, 0x38, 0xe5, 0xa3, - 0x29, 0xfe, 0x9d, 0xeb, 0x7a, 0xf1, 0x1e, 0x2e, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0xe8, 0x07, - 0x62, 0x7b, 0x4b, 0x03, 0x00, 0x00, + // 627 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x54, 0x4f, 0x6f, 0xd3, 0x30, + 0x14, 0x6f, 0xda, 0xad, 0xa3, 0xee, 0xd8, 0x1f, 0xb3, 0xb1, 0xb0, 0x43, 0x5b, 0x55, 0x08, 0x2a, + 0x46, 0x1b, 0x6d, 0x93, 0xd0, 0xb4, 0x1b, 0x65, 0x30, 0x7a, 0xab, 0xd2, 0x9d, 0x90, 0x50, 0xe4, + 0x25, 0xaf, 0x69, 0xb4, 0xc4, 0x0e, 0xb6, 0xd3, 0x51, 0x3e, 0x05, 0x67, 0x3e, 0xd1, 0x8e, 0x3b, + 0x22, 0x0e, 0x15, 0xda, 0xbe, 0xc1, 0x6e, 0xdc, 0x50, 0x6c, 0x77, 0x6b, 0x05, 0x27, 0xdb, 0xef, + 0xf7, 0xc7, 0xbf, 0xf7, 0xea, 0x06, 0xed, 0x70, 0x96, 0x49, 0xe0, 0xce, 0x78, 0xdf, 0x09, 0x81, + 0x82, 0x88, 0x44, 0x27, 0xe5, 0x4c, 0x32, 0x5c, 0xd1, 0x40, 0x67, 0xbc, 0xbf, 0xbb, 0x15, 0xb2, + 0x90, 0xa9, 0xaa, 0x93, 0xef, 0x34, 0xa1, 0xf9, 0xa3, 0x88, 0x56, 0x4f, 0xb5, 0x64, 0x20, 0x89, + 0x04, 0xec, 0xa0, 0x72, 0x4a, 0x38, 0x49, 0x84, 0x6d, 0x35, 0xac, 0x56, 0xf5, 0x60, 0xb3, 0x73, + 0x6f, 0xd1, 0xe9, 0x2b, 0xa0, 0xbb, 0x74, 0x35, 0xad, 0x17, 0x5c, 0x43, 0xc3, 0xdf, 0xd0, 0x66, + 0x44, 0xbd, 0x61, 0x1c, 0x85, 0x23, 0xe9, 0xa5, 0xc4, 0xbf, 0x00, 0x29, 0xec, 0x62, 0xa3, 0xd4, + 0xaa, 0x1e, 0xbc, 0x9e, 0xd3, 0xce, 0x5f, 0xd2, 0xe9, 0xd1, 0x0f, 0x8a, 0xdf, 0xd7, 0xf4, 0xf7, + 0x54, 0xf2, 0x49, 0xb7, 0x91, 0xdb, 0xde, 0x4d, 0xeb, 0xf6, 0x84, 0x24, 0xf1, 0x71, 0xf3, 0x1f, + 0xd3, 0xa6, 0xbb, 0x1e, 0x2d, 0xea, 0x76, 0x3f, 0xa3, 0xad, 0xff, 0x59, 0xe1, 0x0d, 0x54, 0xba, + 0x80, 0x89, 0xea, 0xa0, 0xe2, 0xe6, 0x5b, 0xec, 0xa0, 0xe5, 0x31, 0x89, 0x33, 0xb0, 0x8b, 0xaa, + 0xab, 0x67, 0x73, 0xc9, 0x16, 0x1d, 0x5c, 0xcd, 0x3b, 0x2e, 0x1e, 0x59, 0xcd, 0xaf, 0xa8, 0xac, + 0x5b, 0xc6, 0x14, 0xad, 0x0d, 0x01, 0xbc, 0x14, 0xb8, 0x0f, 0x54, 0x92, 0x10, 0xb4, 0x77, 0xf7, + 0x34, 0xcf, 0xfc, 0x6b, 0x5a, 0x7f, 0x11, 0x46, 0x72, 0x94, 0x9d, 0x77, 0x7c, 0x96, 0x38, 0x3e, + 0x13, 0x09, 0x13, 0x66, 0x69, 0x8b, 0xe0, 0xc2, 0x91, 0x93, 0x14, 0x44, 0xe7, 0x04, 0xfc, 0xbb, + 0x69, 0x7d, 0x5b, 0x77, 0xb7, 0xe8, 0xd6, 0x74, 0x1f, 0x0f, 0x01, 0xfa, 0x0f, 0xe7, 0x3f, 0x25, + 0xb4, 0xb6, 0x98, 0x0b, 0xbf, 0x41, 0x3b, 0x8c, 0x47, 0x61, 0x44, 0x49, 0xec, 0x09, 0xa0, 0x01, + 0x70, 0x8f, 0x04, 0x01, 0x07, 0x21, 0x4c, 0x9f, 0xdb, 0x33, 0x78, 0xa0, 0xd0, 0xb7, 0x1a, 0xc4, + 0xaf, 0xd0, 0x26, 0x87, 0x61, 0x46, 0x03, 0xcf, 0x1f, 0x11, 0x4a, 0x21, 0xf6, 0xa2, 0x40, 0x4d, + 0xa1, 0xe2, 0xae, 0x6b, 0xe0, 0x9d, 0xae, 0xf7, 0x02, 0xfc, 0x1c, 0xad, 0x19, 0x6e, 0xca, 0xb8, + 0xcc, 0x89, 0x25, 0x45, 0x5c, 0xd5, 0xd5, 0x3e, 0xe3, 0xb2, 0x17, 0xe0, 0x7d, 0xb4, 0xad, 0x7f, + 0x12, 0x4f, 0x70, 0x7f, 0xde, 0x75, 0x49, 0x91, 0xb1, 0x06, 0x07, 0xdc, 0x7f, 0x30, 0xde, 0x43, + 0x78, 0x4e, 0x32, 0x33, 0x5f, 0xd6, 0x29, 0xee, 0xf9, 0xc6, 0xff, 0x08, 0xd9, 0x86, 0x2c, 0xa3, + 0x04, 0x58, 0xa6, 0x57, 0x21, 0x49, 0x92, 0xda, 0xe5, 0x86, 0xd5, 0x5a, 0x72, 0x9f, 0x6a, 0xfc, + 0x4c, 0xc3, 0x67, 0x33, 0x14, 0x1f, 0xdc, 0x27, 0x9b, 0x29, 0x47, 0x90, 0x8f, 0xd0, 0x5e, 0x51, + 0x37, 0x3d, 0x59, 0x90, 0x7d, 0x54, 0x10, 0xae, 0xa3, 0xaa, 0xd1, 0x04, 0x44, 0x12, 0xfb, 0x51, + 0xc3, 0x6a, 0xad, 0xba, 0x48, 0x97, 0x4e, 0x88, 0x24, 0xf8, 0x25, 0x32, 0x73, 0xf2, 0x04, 0x7c, + 0xc9, 0x80, 0xfa, 0x60, 0x57, 0x54, 0x0a, 0x33, 0xab, 0x81, 0xa9, 0xe2, 0xbd, 0x7c, 0xd2, 0x92, + 0x47, 0x20, 0x3c, 0x0e, 0x09, 0x89, 0x68, 0x44, 0x43, 0x1b, 0x35, 0xac, 0xd6, 0xb2, 0xbb, 0x61, + 0x00, 0x77, 0x56, 0xc7, 0x36, 0x5a, 0x31, 0x19, 0xed, 0xaa, 0x72, 0x9b, 0x1d, 0xbb, 0xfe, 0xd5, + 0x4d, 0xcd, 0xba, 0xbe, 0xa9, 0x59, 0xbf, 0x6f, 0x6a, 0xd6, 0xf7, 0xdb, 0x5a, 0xe1, 0xfa, 0xb6, + 0x56, 0xf8, 0x79, 0x5b, 0x2b, 0x7c, 0xea, 0xcd, 0xbd, 0x32, 0x21, 0x39, 0xa1, 0x21, 0xc4, 0x6c, + 0x0c, 0xed, 0x31, 0x50, 0x99, 0x71, 0x10, 0x8e, 0x4e, 0xdd, 0x1e, 0x32, 0x7e, 0x49, 0x78, 0xd0, + 0x4e, 0xa2, 0x20, 0x88, 0xe1, 0x92, 0x70, 0x70, 0xc6, 0x87, 0x8e, 0xf9, 0x46, 0xa8, 0xc7, 0x78, + 0x5e, 0x56, 0x7f, 0xff, 0xc3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd0, 0xc6, 0x49, 0x52, 0x3a, + 0x04, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -365,17 +411,50 @@ func (m *InFlightPacket) MarshalToSizedBuffer(dAtA []byte) (int, error) { if m.Timeout != 0 { i = encodeVarintGenesis(dAtA, i, uint64(m.Timeout)) i-- - dAtA[i] = 0x30 + dAtA[i] = 0x58 } if m.RetriesRemaining != 0 { i = encodeVarintGenesis(dAtA, i, uint64(m.RetriesRemaining)) i-- - dAtA[i] = 0x28 + dAtA[i] = 0x50 } if m.RefundSequence != 0 { i = encodeVarintGenesis(dAtA, i, uint64(m.RefundSequence)) i-- - dAtA[i] = 0x20 + dAtA[i] = 0x48 + } + if len(m.PacketData) > 0 { + i -= len(m.PacketData) + copy(dAtA[i:], m.PacketData) + i = encodeVarintGenesis(dAtA, i, uint64(len(m.PacketData))) + i-- + dAtA[i] = 0x42 + } + if len(m.PacketTimeoutHeight) > 0 { + i -= len(m.PacketTimeoutHeight) + copy(dAtA[i:], m.PacketTimeoutHeight) + i = encodeVarintGenesis(dAtA, i, uint64(len(m.PacketTimeoutHeight))) + i-- + dAtA[i] = 0x3a + } + if m.PacketTimeoutTimestamp != 0 { + i = encodeVarintGenesis(dAtA, i, uint64(m.PacketTimeoutTimestamp)) + i-- + dAtA[i] = 0x30 + } + if len(m.PacketSrcPortId) > 0 { + i -= len(m.PacketSrcPortId) + copy(dAtA[i:], m.PacketSrcPortId) + i = encodeVarintGenesis(dAtA, i, uint64(len(m.PacketSrcPortId))) + i-- + dAtA[i] = 0x2a + } + if len(m.PacketSrcChannelId) > 0 { + i -= len(m.PacketSrcChannelId) + copy(dAtA[i:], m.PacketSrcChannelId) + i = encodeVarintGenesis(dAtA, i, uint64(len(m.PacketSrcChannelId))) + i-- + dAtA[i] = 0x22 } if len(m.RefundPortId) > 0 { i -= len(m.RefundPortId) @@ -461,6 +540,25 @@ func (m *InFlightPacket) Size() (n int) { if l > 0 { n += 1 + l + sovGenesis(uint64(l)) } + l = len(m.PacketSrcChannelId) + if l > 0 { + n += 1 + l + sovGenesis(uint64(l)) + } + l = len(m.PacketSrcPortId) + if l > 0 { + n += 1 + l + sovGenesis(uint64(l)) + } + if m.PacketTimeoutTimestamp != 0 { + n += 1 + sovGenesis(uint64(m.PacketTimeoutTimestamp)) + } + l = len(m.PacketTimeoutHeight) + if l > 0 { + n += 1 + l + sovGenesis(uint64(l)) + } + l = len(m.PacketData) + if l > 0 { + n += 1 + l + sovGenesis(uint64(l)) + } if m.RefundSequence != 0 { n += 1 + sovGenesis(uint64(m.RefundSequence)) } @@ -901,6 +999,155 @@ func (m *InFlightPacket) Unmarshal(dAtA []byte) error { m.RefundPortId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PacketSrcChannelId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + 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 ErrInvalidLengthGenesis + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PacketSrcChannelId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PacketSrcPortId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + 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 ErrInvalidLengthGenesis + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PacketSrcPortId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 6: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field PacketTimeoutTimestamp", wireType) + } + m.PacketTimeoutTimestamp = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.PacketTimeoutTimestamp |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PacketTimeoutHeight", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + 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 ErrInvalidLengthGenesis + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PacketTimeoutHeight = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PacketData", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthGenesis + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PacketData = append(m.PacketData[:0], dAtA[iNdEx:postIndex]...) + if m.PacketData == nil { + m.PacketData = []byte{} + } + iNdEx = postIndex + case 9: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field RefundSequence", wireType) } @@ -919,7 +1166,7 @@ func (m *InFlightPacket) Unmarshal(dAtA []byte) error { break } } - case 5: + case 10: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field RetriesRemaining", wireType) } @@ -938,7 +1185,7 @@ func (m *InFlightPacket) Unmarshal(dAtA []byte) error { break } } - case 6: + case 11: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Timeout", wireType) } diff --git a/test/mock/channel_keeper.go b/test/mock/channel_keeper.go index b638d6f..d0ccf9b 100644 --- a/test/mock/channel_keeper.go +++ b/test/mock/channel_keeper.go @@ -8,6 +8,8 @@ import ( reflect "reflect" types "github.com/cosmos/cosmos-sdk/types" + types0 "github.com/cosmos/cosmos-sdk/x/capability/types" + exported "github.com/cosmos/ibc-go/v3/modules/core/exported" gomock "github.com/golang/mock/gomock" ) @@ -34,17 +36,32 @@ func (m *MockChannelKeeper) EXPECT() *MockChannelKeeperMockRecorder { return m.recorder } -// GetNextSequenceSend mocks base method. -func (m *MockChannelKeeper) GetNextSequenceSend(arg0 types.Context, arg1, arg2 string) (uint64, bool) { +// LookupModuleByChannel mocks base method. +func (m *MockChannelKeeper) LookupModuleByChannel(arg0 types.Context, arg1, arg2 string) (string, *types0.Capability, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetNextSequenceSend", arg0, arg1, arg2) - ret0, _ := ret[0].(uint64) - ret1, _ := ret[1].(bool) - return ret0, ret1 + ret := m.ctrl.Call(m, "LookupModuleByChannel", arg0, arg1, arg2) + ret0, _ := ret[0].(string) + ret1, _ := ret[1].(*types0.Capability) + ret2, _ := ret[2].(error) + return ret0, ret1, ret2 } -// GetNextSequenceSend indicates an expected call of GetNextSequenceSend. -func (mr *MockChannelKeeperMockRecorder) GetNextSequenceSend(arg0, arg1, arg2 interface{}) *gomock.Call { +// LookupModuleByChannel indicates an expected call of LookupModuleByChannel. +func (mr *MockChannelKeeperMockRecorder) LookupModuleByChannel(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetNextSequenceSend", reflect.TypeOf((*MockChannelKeeper)(nil).GetNextSequenceSend), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LookupModuleByChannel", reflect.TypeOf((*MockChannelKeeper)(nil).LookupModuleByChannel), arg0, arg1, arg2) +} + +// WriteAcknowledgement mocks base method. +func (m *MockChannelKeeper) WriteAcknowledgement(arg0 types.Context, arg1 *types0.Capability, arg2 exported.PacketI, arg3 exported.Acknowledgement) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "WriteAcknowledgement", arg0, arg1, arg2, arg3) + ret0, _ := ret[0].(error) + return ret0 +} + +// WriteAcknowledgement indicates an expected call of WriteAcknowledgement. +func (mr *MockChannelKeeperMockRecorder) WriteAcknowledgement(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WriteAcknowledgement", reflect.TypeOf((*MockChannelKeeper)(nil).WriteAcknowledgement), arg0, arg1, arg2, arg3) } From 6db24b6620333634f15c040633e5c8371f6bb4a1 Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Sun, 6 Nov 2022 12:59:49 -0700 Subject: [PATCH 20/24] Populate inFlightPacket --- router/keeper/keeper.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/router/keeper/keeper.go b/router/keeper/keeper.go index 0f6afdd..f98ade0 100644 --- a/router/keeper/keeper.go +++ b/router/keeper/keeper.go @@ -203,10 +203,16 @@ func (k Keeper) ForwardTransferPacket( if inFlightPacket == nil { inFlightPacket = &types.InFlightPacket{ + PacketData: srcPacket.Data, OriginalSenderAddress: srcPacketSender, RefundChannelId: srcPacket.DestinationChannel, RefundPortId: srcPacket.DestinationPort, RefundSequence: srcPacket.Sequence, + PacketSrcPortId: srcPacket.SourcePort, + PacketSrcChannelId: srcPacket.SourceChannel, + + PacketTimeoutTimestamp: srcPacket.TimeoutTimestamp, + PacketTimeoutHeight: srcPacket.TimeoutHeight.String(), RetriesRemaining: int32(maxRetries), Timeout: uint64(timeout.Nanoseconds()), From 5446f6165459efb56589702307b7dde581de47cd Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Sun, 6 Nov 2022 21:43:18 -0700 Subject: [PATCH 21/24] do not call upstream OnAcknowledgementPacket or OnTimeoutPacket when handling a forwarded packet response to stop refund processing. --- router/keeper/keeper.go | 9 +-------- router/module.go | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/router/keeper/keeper.go b/router/keeper/keeper.go index f98ade0..20eb83e 100644 --- a/router/keeper/keeper.go +++ b/router/keeper/keeper.go @@ -100,16 +100,9 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger { func (k Keeper) WriteAcknowledgementForForwardedPacket( ctx sdk.Context, - sequence uint64, - port, channel string, + inFlightPacket *types.InFlightPacket, ack channeltypes.Acknowledgement, ) error { - inFlightPacket := k.GetAndClearInFlightPacket(ctx, channel, port, sequence) - if inFlightPacket == nil { - // not a forwarded packet - return nil - } - // Lookup module by channel capability _, cap, err := k.channelKeeper.LookupModuleByChannel(ctx, inFlightPacket.RefundPortId, inFlightPacket.RefundChannelId) if err != nil { diff --git a/router/module.go b/router/module.go index 47f928a..ab50a6f 100644 --- a/router/module.go +++ b/router/module.go @@ -333,17 +333,18 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes "amount", data.Amount, "denom", data.Denom, ) - if err := am.app.OnAcknowledgementPacket(ctx, packet, acknowledgement, relayer); err != nil { - return err - } - var ack channeltypes.Acknowledgement if err := channeltypes.SubModuleCdc.UnmarshalJSON(acknowledgement, &ack); err != nil { return sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-20 transfer packet acknowledgement: %v", err) } - // WriteAcknowledgement with proxied ack to return success/fail to previous chain. - return am.keeper.WriteAcknowledgementForForwardedPacket(ctx, packet.Sequence, packet.SourcePort, packet.SourceChannel, ack) + inFlightPacket := am.keeper.GetAndClearInFlightPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence) + if inFlightPacket != nil { + // this is a forwarded packet, so override handling to avoid refund from being processed. + return am.keeper.WriteAcknowledgementForForwardedPacket(ctx, inFlightPacket, ack) + } + + return am.app.OnAcknowledgementPacket(ctx, packet, acknowledgement, relayer) } // OnTimeoutPacket implements the IBCModule interface @@ -366,14 +367,14 @@ func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, "amount", data.Amount, "denom", data.Denom, ) - if err := am.app.OnTimeoutPacket(ctx, packet, relayer); err != nil { - return err - } - if err := am.keeper.HandleTimeout(ctx, packet); err != nil { // WriteAcknowledgement with proxied ack to return success/fail to previous chain. - return am.keeper.WriteAcknowledgementForForwardedPacket(ctx, packet.Sequence, packet.SourcePort, packet.SourceChannel, channeltypes.NewErrorAcknowledgement(err.Error())) + inFlightPacket := am.keeper.GetAndClearInFlightPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence) + if inFlightPacket != nil { + // this is a forwarded packet, so override handling to avoid refund from being processed. + return am.keeper.WriteAcknowledgementForForwardedPacket(ctx, inFlightPacket, channeltypes.NewErrorAcknowledgement(err.Error())) + } } - return nil + return am.app.OnTimeoutPacket(ctx, packet, relayer) } From 8d13c918806424b7aede8d927f473e8b431ac044 Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Sun, 6 Nov 2022 23:32:12 -0700 Subject: [PATCH 22/24] Fix timeout retry --- router/keeper/keeper.go | 39 +++++++++++++++++---------------------- router/module.go | 16 +++++++++++----- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/router/keeper/keeper.go b/router/keeper/keeper.go index 20eb83e..a396317 100644 --- a/router/keeper/keeper.go +++ b/router/keeper/keeper.go @@ -235,16 +235,17 @@ func (k Keeper) ForwardTransferPacket( return nil } -func (k Keeper) HandleTimeout( +// TimeoutShouldRetry returns inFlightPacket and no error if retry should be attempted. Error is returned if IBC refund should occur. +func (k Keeper) TimeoutShouldRetry( ctx sdk.Context, packet channeltypes.Packet, -) error { +) (*types.InFlightPacket, error) { store := ctx.KVStore(k.storeKey) key := types.RefundPacketKey(packet.SourceChannel, packet.SourcePort, packet.Sequence) if !store.Has(key) { // not a forwarded packet, ignore. - return nil + return nil, nil } bz := store.Get(key) @@ -258,29 +259,24 @@ func (k Keeper) HandleTimeout( "refund-channel-id", inFlightPacket.RefundChannelId, "refund-port-id", inFlightPacket.RefundPortId, ) - return fmt.Errorf("giving up on packet on channel (%s) port (%s) after max retries", + return &inFlightPacket, fmt.Errorf("giving up on packet on channel (%s) port (%s) after max retries", inFlightPacket.RefundChannelId, inFlightPacket.RefundPortId) } - // Parse packet data - var data transfertypes.FungibleTokenPacketData - if err := transfertypes.ModuleCdc.UnmarshalJSON(packet.GetData(), &data); err != nil { - k.Logger(ctx).Error("packetForwardMiddleware error unmarshalling packet data", - "key", string(key), - "original-sender-address", inFlightPacket.OriginalSenderAddress, - "refund-channel-id", inFlightPacket.RefundChannelId, - "refund-port-id", inFlightPacket.RefundPortId, - "retries-remaining", inFlightPacket.RetriesRemaining, - "error", err, - ) - return fmt.Errorf("error unmarshalling packet data: %w", err) - } + return &inFlightPacket, nil +} +func (k Keeper) RetryTimeout( + ctx sdk.Context, + channel, port string, + data transfertypes.FungibleTokenPacketData, + inFlightPacket *types.InFlightPacket, +) error { // send transfer again metadata := &ForwardMetadata{ Receiver: data.Receiver, - Channel: packet.SourceChannel, - Port: packet.SourcePort, + Channel: channel, + Port: port, } if data.Memo != "" { @@ -289,8 +285,7 @@ func (k Keeper) HandleTimeout( amount, ok := sdk.NewIntFromString(data.Amount) if !ok { - k.Logger(ctx).Error("packetForwardMiddleware error parsing amount from string for router retry", - "key", string(key), + k.Logger(ctx).Error("packetForwardMiddleware error parsing amount from string for router retry on timeout", "original-sender-address", inFlightPacket.OriginalSenderAddress, "refund-channel-id", inFlightPacket.RefundChannelId, "refund-port-id", inFlightPacket.RefundPortId, @@ -307,7 +302,7 @@ func (k Keeper) HandleTimeout( // srcPacket and srcPacketSender are empty because inFlightPacket is non-nil. return k.ForwardTransferPacket( ctx, - &inFlightPacket, + inFlightPacket, channeltypes.Packet{}, "", data.Sender, diff --git a/router/module.go b/router/module.go index ab50a6f..fa3ec83 100644 --- a/router/module.go +++ b/router/module.go @@ -367,13 +367,19 @@ func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, "amount", data.Amount, "denom", data.Denom, ) - if err := am.keeper.HandleTimeout(ctx, packet); err != nil { - // WriteAcknowledgement with proxied ack to return success/fail to previous chain. - inFlightPacket := am.keeper.GetAndClearInFlightPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence) - if inFlightPacket != nil { - // this is a forwarded packet, so override handling to avoid refund from being processed. + inFlightPacket, err := am.keeper.TimeoutShouldRetry(ctx, packet) + if inFlightPacket != nil { + if err != nil { + am.keeper.RemoveInFlightPacket(ctx, packet) + // this is a forwarded packet, so override handling to avoid refund from being processed on this chain. + // WriteAcknowledgement with proxied ack to return success/fail to previous chain. return am.keeper.WriteAcknowledgementForForwardedPacket(ctx, inFlightPacket, channeltypes.NewErrorAcknowledgement(err.Error())) } + // timeout should be retried. In order to do that, we need to handle this timeout to refund on this chain first. + if err := am.app.OnTimeoutPacket(ctx, packet, relayer); err != nil { + return err + } + return am.keeper.RetryTimeout(ctx, packet.SourceChannel, packet.SourcePort, data, inFlightPacket) } return am.app.OnTimeoutPacket(ctx, packet, relayer) From 25671c357627c66ad0d51113a4b421f74a82b025 Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Mon, 7 Nov 2022 10:21:18 -0700 Subject: [PATCH 23/24] Update to v3.4.0 stable ibc-go --- go.mod | 6 +++--- go.sum | 20 ++++++-------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index 9f51284..5bf5c44 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alp require ( github.com/armon/go-metrics v0.4.0 github.com/cosmos/cosmos-sdk v0.45.10 - github.com/cosmos/ibc-go/v3 v3.0.0-rc2.0.20221027123302-68845e541902 + github.com/cosmos/ibc-go/v3 v3.4.0 github.com/gogo/protobuf v1.3.3 github.com/golang/mock v1.6.0 github.com/golang/protobuf v1.5.2 @@ -16,7 +16,7 @@ require ( github.com/spf13/cobra v1.5.0 github.com/stretchr/testify v1.8.0 github.com/tendermint/tendermint v0.34.22 - github.com/tendermint/tm-db v0.6.6 + github.com/tendermint/tm-db v0.6.7 google.golang.org/genproto v0.0.0-20220725144611-272f38e5d71b google.golang.org/grpc v1.50.0 ) @@ -34,6 +34,7 @@ require ( github.com/confio/ics23/go v0.7.0 // indirect github.com/cosmos/btcutil v1.0.4 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect + github.com/cosmos/gorocksdb v1.2.0 // indirect github.com/cosmos/iavl v0.19.3 // indirect github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect github.com/cosmos/ledger-go v0.9.2 // indirect @@ -91,7 +92,6 @@ require ( github.com/spf13/viper v1.13.0 // indirect github.com/subosito/gotenv v1.4.1 // indirect github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca // indirect - github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect github.com/tendermint/btcd v0.1.1 // indirect github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect github.com/tendermint/go-amino v0.16.0 // indirect diff --git a/go.sum b/go.sum index 2abb27e..986b8ae 100644 --- a/go.sum +++ b/go.sum @@ -97,10 +97,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/coinbase/rosetta-sdk-go v0.7.0 h1:lmTO/JEpCvZgpbkOITL95rA80CPKb5CtMzLaqF2mCNg= github.com/confio/ics23/go v0.7.0 h1:00d2kukk7sPoHWL4zZBZwzxnpA2pec1NPdwbSokJ5w8= github.com/confio/ics23/go v0.7.0/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= @@ -114,10 +110,12 @@ github.com/cosmos/cosmos-sdk v0.45.10/go.mod h1:CbfWNs4PuxxsvRD/snQuSBDwIhtsD7rI github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= +github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y= +github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= github.com/cosmos/iavl v0.19.3 h1:cESO0OwTTxQm5rmyESKW+zESheDUYI7CcZDWWDwnuxg= github.com/cosmos/iavl v0.19.3/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= -github.com/cosmos/ibc-go/v3 v3.0.0-rc2.0.20221027123302-68845e541902 h1:k6Uoi9bIX2SOjr3JG7WjNzy/QjL6WOuEfRe0rq7ARm4= -github.com/cosmos/ibc-go/v3 v3.0.0-rc2.0.20221027123302-68845e541902/go.mod h1:VUWLHw0C3USmTQZnTdkuXXdUdLbW8zsK3lV1Ieposog= +github.com/cosmos/ibc-go/v3 v3.4.0 h1:ha3cqEG36pqMWqA1D+kxDWBTZXpeFMd/aZIQF7I0xro= +github.com/cosmos/ibc-go/v3 v3.4.0/go.mod h1:VwB/vWu4ysT5DN2aF78d17LYmx3omSAdq6gpKvM7XRA= github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4= github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY= github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI= @@ -149,7 +147,6 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= @@ -464,8 +461,6 @@ github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca h1:Ld/zXl5t4+D69SiV4JoN7kkfvJdOWlPpfxrzxpLMoUk= github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca/go.mod h1:u2MKkTVTVJWe5D1rCvame8WqhBd88EuIwODJZ1VHCPM= -github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok= -github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= github.com/tendermint/btcd v0.1.1 h1:0VcxPfflS2zZ3RiOAHkBiFUcPvbtRj5O7zHmcJWHV7s= github.com/tendermint/btcd v0.1.1/go.mod h1:DC6/m53jtQzr/NFmMNEu0rxf18/ktVoVtMrnDD5pN+U= github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 h1:hqAk8riJvK4RMWx1aInLzndwxKalgi5rTqgfXxOxbEI= @@ -474,8 +469,8 @@ github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2l github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= github.com/tendermint/tendermint v0.34.22 h1:XMhtC8s8QqJO4l/dn+TkQvevTRSow3Vixjclr41o+2Q= github.com/tendermint/tendermint v0.34.22/go.mod h1:YpP5vBEAKUT4g6oyfjKgFeZmdB/GjkJAxfF+cgmJg6Y= -github.com/tendermint/tm-db v0.6.6 h1:EzhaOfR0bdKyATqcd5PNeyeq8r+V4bRPHBfyFdD9kGM= -github.com/tendermint/tm-db v0.6.6/go.mod h1:wP8d49A85B7/erz/r4YbKssKw6ylsO/hKtFk7E1aWZI= +github.com/tendermint/tm-db v0.6.7 h1:fE00Cbl0jayAoqlExN6oyQJ7fR/ZtoVOmvPJ//+shu8= +github.com/tendermint/tm-db v0.6.7/go.mod h1:byQDzFkZV1syXr/ReXS808NxA2xvyuuVgXOJ/088L6I= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= @@ -494,7 +489,6 @@ 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.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= @@ -831,8 +825,6 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.50.0 h1:fPVVDxY9w++VjTZsYvXWqEf9Rqar/e+9zYfxKK+W+YU= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= From 8ec497920393ea359ba4bd4f9112222422a8cfef Mon Sep 17 00:00:00 2001 From: Andrew Gouin Date: Mon, 7 Nov 2022 17:11:16 -0700 Subject: [PATCH 24/24] Burn escrowed funds or transfer to other escrow account on refund. --- Makefile | 1 + router/keeper/keeper.go | 68 +++++++++++++++++++++++++++- router/module.go | 4 +- router/types/expected_keepers.go | 8 ++++ test/mock/bank_keeper.go | 77 ++++++++++++++++++++++++++++++++ test/mock/transfer_keeper.go | 22 +++++++-- test/setup.go | 6 ++- 7 files changed, 178 insertions(+), 8 deletions(-) create mode 100644 test/mock/bank_keeper.go diff --git a/Makefile b/Makefile index 04ce06a..dd0743d 100644 --- a/Makefile +++ b/Makefile @@ -145,6 +145,7 @@ mocks: $(MOCKS_DIR) mockgen -package=mock -destination=./test/mock/transfer_keeper.go $(GOMOD)/router/types TransferKeeper mockgen -package=mock -destination=./test/mock/channel_keeper.go $(GOMOD)/router/types ChannelKeeper mockgen -package=mock -destination=./test/mock/distribution_keeper.go $(GOMOD)/router/types DistributionKeeper + mockgen -package=mock -destination=./test/mock/bank_keeper.go $(GOMOD)/router/types BankKeeper mockgen -package=mock -destination=./test/mock/ibc_module.go github.com/cosmos/ibc-go/v3/modules/core/05-port/types IBCModule .PHONY: mocks diff --git a/router/keeper/keeper.go b/router/keeper/keeper.go index a396317..4d0df30 100644 --- a/router/keeper/keeper.go +++ b/router/keeper/keeper.go @@ -2,6 +2,7 @@ package keeper import ( "fmt" + "strings" "time" "github.com/armon/go-metrics" @@ -30,6 +31,7 @@ type Keeper struct { transferKeeper types.TransferKeeper channelKeeper types.ChannelKeeper distrKeeper types.DistributionKeeper + bankKeeper types.BankKeeper } type PacketMetadata struct { @@ -75,7 +77,8 @@ var ( // NewKeeper creates a new 29-fee Keeper instance func NewKeeper( cdc codec.BinaryCodec, key storetypes.StoreKey, paramSpace paramtypes.Subspace, - transferKeeper types.TransferKeeper, channelKeeper types.ChannelKeeper, distrKeeper types.DistributionKeeper, + transferKeeper types.TransferKeeper, channelKeeper types.ChannelKeeper, + distrKeeper types.DistributionKeeper, bankKeeper types.BankKeeper, ) Keeper { // set KeyTable if it has not already been set if !paramSpace.HasKeyTable() { @@ -90,6 +93,7 @@ func NewKeeper( transferKeeper: transferKeeper, channelKeeper: channelKeeper, distrKeeper: distrKeeper, + bankKeeper: bankKeeper, } } @@ -100,6 +104,8 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger { func (k Keeper) WriteAcknowledgementForForwardedPacket( ctx sdk.Context, + packet channeltypes.Packet, + data transfertypes.FungibleTokenPacketData, inFlightPacket *types.InFlightPacket, ack channeltypes.Acknowledgement, ) error { @@ -109,6 +115,66 @@ func (k Keeper) WriteAcknowledgementForForwardedPacket( return sdkerrors.Wrap(err, "could not retrieve module from port-id") } + // for forwarded packets, the funds were moved into an escrow account if the denom originated on this chain. + // On an ack error or timeout on a forwarded packet, the funds in the escrow account + // should be moved to the other escrow account on the other side or burned. + if !ack.Success() { + fullDenomPath := data.Denom + + // deconstruct the token denomination into the denomination trace info + // to determine if the sender is the source chain + if strings.HasPrefix(data.Denom, "ibc/") { + fullDenomPath, err = k.transferKeeper.DenomPathFromHash(ctx, data.Denom) + if err != nil { + return err + } + } + + if transfertypes.SenderChainIsSource(packet.SourcePort, packet.SourceChannel, fullDenomPath) { + // funds were moved to escrow account for transfer, so they need to either: + // - move to the other escrow account, in the case of native denom + // - burn + + amount, ok := sdk.NewIntFromString(data.Amount) + if !ok { + return fmt.Errorf("failed to parse amount from packet data for forward refund: %s", data.Amount) + } + denomTrace := transfertypes.ParseDenomTrace(fullDenomPath) + token := sdk.NewCoin(denomTrace.IBCDenom(), amount) + + escrowAddress := transfertypes.GetEscrowAddress(packet.SourcePort, packet.SourceChannel) + + if transfertypes.SenderChainIsSource(inFlightPacket.RefundPortId, inFlightPacket.RefundChannelId, fullDenomPath) { + // transfer funds from escrow account for forwarded packet to escrow account going back for refund. + + refundEscrowAddress := transfertypes.GetEscrowAddress(inFlightPacket.RefundPortId, inFlightPacket.RefundChannelId) + + if err := k.bankKeeper.SendCoins( + ctx, escrowAddress, refundEscrowAddress, sdk.NewCoins(token), + ); err != nil { + return fmt.Errorf("failed to send coins from escrow account to refund escrow account: %w", err) + } + } else { + // transfer the coins from the escrow account to the module account and burn them. + + if err := k.bankKeeper.SendCoinsFromAccountToModule( + ctx, escrowAddress, transfertypes.ModuleName, sdk.NewCoins(token), + ); err != nil { + return fmt.Errorf("failed to send coins from escrow to module account for burn: %w", err) + } + + if err := k.bankKeeper.BurnCoins( + ctx, transfertypes.ModuleName, sdk.NewCoins(token), + ); err != nil { + // NOTE: should not happen as the module account was + // retrieved on the step above and it has enough balace + // to burn. + panic(fmt.Sprintf("cannot burn coins after a successful send from escrow account to module account: %v", err)) + } + } + } + } + return k.channelKeeper.WriteAcknowledgement(ctx, cap, channeltypes.Packet{ Data: inFlightPacket.PacketData, Sequence: inFlightPacket.RefundSequence, diff --git a/router/module.go b/router/module.go index fa3ec83..a469088 100644 --- a/router/module.go +++ b/router/module.go @@ -341,7 +341,7 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes inFlightPacket := am.keeper.GetAndClearInFlightPacket(ctx, packet.SourceChannel, packet.SourcePort, packet.Sequence) if inFlightPacket != nil { // this is a forwarded packet, so override handling to avoid refund from being processed. - return am.keeper.WriteAcknowledgementForForwardedPacket(ctx, inFlightPacket, ack) + return am.keeper.WriteAcknowledgementForForwardedPacket(ctx, packet, data, inFlightPacket, ack) } return am.app.OnAcknowledgementPacket(ctx, packet, acknowledgement, relayer) @@ -373,7 +373,7 @@ func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, am.keeper.RemoveInFlightPacket(ctx, packet) // this is a forwarded packet, so override handling to avoid refund from being processed on this chain. // WriteAcknowledgement with proxied ack to return success/fail to previous chain. - return am.keeper.WriteAcknowledgementForForwardedPacket(ctx, inFlightPacket, channeltypes.NewErrorAcknowledgement(err.Error())) + return am.keeper.WriteAcknowledgementForForwardedPacket(ctx, packet, data, inFlightPacket, channeltypes.NewErrorAcknowledgement(err.Error())) } // timeout should be retried. In order to do that, we need to handle this timeout to refund on this chain first. if err := am.app.OnTimeoutPacket(ctx, packet, relayer); err != nil { diff --git a/router/types/expected_keepers.go b/router/types/expected_keepers.go index 887c3b6..9a6fc2f 100644 --- a/router/types/expected_keepers.go +++ b/router/types/expected_keepers.go @@ -12,6 +12,7 @@ import ( // TransferKeeper defines the expected transfer keeper type TransferKeeper interface { Transfer(ctx context.Context, msg *types.MsgTransfer) (*types.MsgTransferResponse, error) + DenomPathFromHash(ctx sdk.Context, denom string) (string, error) } // ChannelKeeper defines the expected IBC channel keeper @@ -29,3 +30,10 @@ type ChannelKeeper interface { type DistributionKeeper interface { FundCommunityPool(ctx sdk.Context, amount sdk.Coins, sender sdk.AccAddress) error } + +// BankKeeper defines the expected bank keeper +type BankKeeper interface { + SendCoins(ctx sdk.Context, fromAddr sdk.AccAddress, toAddr sdk.AccAddress, amt sdk.Coins) error + SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error + BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error +} diff --git a/test/mock/bank_keeper.go b/test/mock/bank_keeper.go new file mode 100644 index 0000000..e52e177 --- /dev/null +++ b/test/mock/bank_keeper.go @@ -0,0 +1,77 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: github.com/strangelove-ventures/packet-forward-middleware/v3/router/types (interfaces: BankKeeper) + +// Package mock is a generated GoMock package. +package mock + +import ( + reflect "reflect" + + types "github.com/cosmos/cosmos-sdk/types" + gomock "github.com/golang/mock/gomock" +) + +// MockBankKeeper is a mock of BankKeeper interface. +type MockBankKeeper struct { + ctrl *gomock.Controller + recorder *MockBankKeeperMockRecorder +} + +// MockBankKeeperMockRecorder is the mock recorder for MockBankKeeper. +type MockBankKeeperMockRecorder struct { + mock *MockBankKeeper +} + +// NewMockBankKeeper creates a new mock instance. +func NewMockBankKeeper(ctrl *gomock.Controller) *MockBankKeeper { + mock := &MockBankKeeper{ctrl: ctrl} + mock.recorder = &MockBankKeeperMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockBankKeeper) EXPECT() *MockBankKeeperMockRecorder { + return m.recorder +} + +// BurnCoins mocks base method. +func (m *MockBankKeeper) BurnCoins(arg0 types.Context, arg1 string, arg2 types.Coins) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "BurnCoins", arg0, arg1, arg2) + ret0, _ := ret[0].(error) + return ret0 +} + +// BurnCoins indicates an expected call of BurnCoins. +func (mr *MockBankKeeperMockRecorder) BurnCoins(arg0, arg1, arg2 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BurnCoins", reflect.TypeOf((*MockBankKeeper)(nil).BurnCoins), arg0, arg1, arg2) +} + +// SendCoins mocks base method. +func (m *MockBankKeeper) SendCoins(arg0 types.Context, arg1, arg2 types.AccAddress, arg3 types.Coins) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "SendCoins", arg0, arg1, arg2, arg3) + ret0, _ := ret[0].(error) + return ret0 +} + +// SendCoins indicates an expected call of SendCoins. +func (mr *MockBankKeeperMockRecorder) SendCoins(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendCoins", reflect.TypeOf((*MockBankKeeper)(nil).SendCoins), arg0, arg1, arg2, arg3) +} + +// SendCoinsFromAccountToModule mocks base method. +func (m *MockBankKeeper) SendCoinsFromAccountToModule(arg0 types.Context, arg1 types.AccAddress, arg2 string, arg3 types.Coins) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "SendCoinsFromAccountToModule", arg0, arg1, arg2, arg3) + ret0, _ := ret[0].(error) + return ret0 +} + +// SendCoinsFromAccountToModule indicates an expected call of SendCoinsFromAccountToModule. +func (mr *MockBankKeeperMockRecorder) SendCoinsFromAccountToModule(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendCoinsFromAccountToModule", reflect.TypeOf((*MockBankKeeper)(nil).SendCoinsFromAccountToModule), arg0, arg1, arg2, arg3) +} diff --git a/test/mock/transfer_keeper.go b/test/mock/transfer_keeper.go index b188ae8..2fb0e14 100644 --- a/test/mock/transfer_keeper.go +++ b/test/mock/transfer_keeper.go @@ -8,7 +8,8 @@ import ( context "context" reflect "reflect" - types "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" + types "github.com/cosmos/cosmos-sdk/types" + types0 "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" gomock "github.com/golang/mock/gomock" ) @@ -35,11 +36,26 @@ func (m *MockTransferKeeper) EXPECT() *MockTransferKeeperMockRecorder { return m.recorder } +// DenomPathFromHash mocks base method. +func (m *MockTransferKeeper) DenomPathFromHash(arg0 types.Context, arg1 string) (string, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "DenomPathFromHash", arg0, arg1) + ret0, _ := ret[0].(string) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// DenomPathFromHash indicates an expected call of DenomPathFromHash. +func (mr *MockTransferKeeperMockRecorder) DenomPathFromHash(arg0, arg1 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DenomPathFromHash", reflect.TypeOf((*MockTransferKeeper)(nil).DenomPathFromHash), arg0, arg1) +} + // Transfer mocks base method. -func (m *MockTransferKeeper) Transfer(arg0 context.Context, arg1 *types.MsgTransfer) (*types.MsgTransferResponse, error) { +func (m *MockTransferKeeper) Transfer(arg0 context.Context, arg1 *types0.MsgTransfer) (*types0.MsgTransferResponse, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Transfer", arg0, arg1) - ret0, _ := ret[0].(*types.MsgTransferResponse) + ret0, _ := ret[0].(*types0.MsgTransferResponse) ret1, _ := ret[1].(error) return ret0, ret1 } diff --git a/test/setup.go b/test/setup.go index d186654..ec448ce 100644 --- a/test/setup.go +++ b/test/setup.go @@ -28,10 +28,11 @@ func NewTestSetup(t *testing.T, ctl *gomock.Controller) *TestSetup { transferKeeperMock := mock.NewMockTransferKeeper(ctl) channelKeeperMock := mock.NewMockChannelKeeper(ctl) distributionKeeperMock := mock.NewMockDistributionKeeper(ctl) + bankKeeperMock := mock.NewMockBankKeeper(ctl) ibcModuleMock := mock.NewMockIBCModule(ctl) paramsKeeper := initializer.paramsKeeper() - routerKeeper := initializer.routerKeeper(paramsKeeper, transferKeeperMock, channelKeeperMock, distributionKeeperMock) + routerKeeper := initializer.routerKeeper(paramsKeeper, transferKeeperMock, channelKeeperMock, distributionKeeperMock, bankKeeperMock) routerModule := initializer.routerModule(routerKeeper, ibcModuleMock) require.NoError(t, initializer.StateStore.LoadLatestVersion()) @@ -124,12 +125,13 @@ func (i initializer) routerKeeper( transferKeeper types.TransferKeeper, channelKeeper types.ChannelKeeper, distributionKeeper types.DistributionKeeper, + bankKeeper types.BankKeeper, ) keeper.Keeper { storeKey := sdk.NewKVStoreKey(types.StoreKey) i.StateStore.MountStoreWithDB(storeKey, storetypes.StoreTypeIAVL, i.DB) subspace := paramsKeeper.Subspace(types.ModuleName) - routerKeeper := keeper.NewKeeper(i.Marshaler, storeKey, subspace, transferKeeper, channelKeeper, distributionKeeper) + routerKeeper := keeper.NewKeeper(i.Marshaler, storeKey, subspace, transferKeeper, channelKeeper, distributionKeeper, bankKeeper) return routerKeeper }