diff --git a/go.mod b/go.mod index 19b55f9..dc29449 100644 --- a/go.mod +++ b/go.mod @@ -4,12 +4,25 @@ module github.com/strangelove-ventures/packet-forward-middleware/v2 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/gogo/protobuf v1.3.3 + 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/tendermint/tendermint v0.34.14 + google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa + google.golang.org/grpc v1.44.0 +) + require ( filippo.io/edwards25519 v1.0.0-beta.2 // indirect github.com/99designs/keyring v1.1.6 // indirect github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect github.com/DataDog/zstd v1.4.5 // indirect - github.com/armon/go-metrics v0.3.10 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 @@ -17,10 +30,8 @@ require ( 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/cosmos-sdk v0.45.1 github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/iavl v0.17.3 // indirect - github.com/cosmos/ibc-go/v3 v3.0.0 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 @@ -34,15 +45,11 @@ require ( github.com/go-kit/kit v0.10.0 // indirect github.com/go-logfmt/logfmt v0.5.0 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect - github.com/gogo/protobuf v1.3.3 - github.com/golang/protobuf v1.5.2 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/mux v1.8.0 github.com/gorilla/websocket v1.4.2 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect - github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/gtank/merlin v0.1.1 // indirect github.com/gtank/ristretto255 v0.1.2 // indirect @@ -74,7 +81,6 @@ require ( 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/spf13/cobra v1.3.0 github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.10.1 // indirect @@ -85,7 +91,6 @@ require ( 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/tendermint/tendermint v0.34.14 github.com/tendermint/tm-db v0.6.4 // indirect github.com/zondax/hid v0.9.0 // indirect go.etcd.io/bbolt v1.3.5 // indirect @@ -94,8 +99,6 @@ require ( golang.org/x/sys v0.0.0-20211210111614-af8b64212486 // indirect golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect golang.org/x/text v0.3.7 // indirect - google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa - google.golang.org/grpc v1.44.0 google.golang.org/protobuf v1.27.1 // indirect gopkg.in/ini.v1 v1.66.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/router/types/genesis.pb.go b/router/types/genesis.pb.go index 8b616d2..618b1be 100644 --- a/router/types/genesis.pb.go +++ b/router/types/genesis.pb.go @@ -115,25 +115,26 @@ func init() { func init() { proto.RegisterFile("router/v1/genesis.proto", fileDescriptor_4940b763c55c4e0b) } var fileDescriptor_4940b763c55c4e0b = []byte{ - // 288 bytes of a gzipped FileDescriptorProto + // 291 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x50, 0x4d, 0x4b, 0xc3, 0x40, 0x10, 0x4d, 0x40, 0x02, 0x8d, 0x1f, 0x60, 0x50, 0x14, 0x0f, 0x1b, 0xc9, 0x41, 0xbc, 0x64, 0x97, - 0xea, 0xcd, 0x8b, 0x10, 0xc4, 0x5e, 0x4b, 0xbd, 0x79, 0xd1, 0x6d, 0x32, 0x59, 0x43, 0x93, 0x6c, - 0xd8, 0x9d, 0xa4, 0xf6, 0x5f, 0xf8, 0xb3, 0x7a, 0xec, 0x51, 0x3c, 0x04, 0x49, 0xfe, 0x81, 0xbf, - 0x40, 0x9a, 0x84, 0xa2, 0xa7, 0x99, 0x79, 0xef, 0xcd, 0x9b, 0xe1, 0xd9, 0x67, 0x4a, 0x96, 0x08, - 0x8a, 0x55, 0x63, 0x26, 0x20, 0x07, 0x9d, 0x68, 0x5a, 0x28, 0x89, 0xd2, 0x19, 0xf5, 0x04, 0xad, - 0xc6, 0x17, 0x27, 0x42, 0x0a, 0xd9, 0xa1, 0x6c, 0xdb, 0xf5, 0x02, 0xef, 0xde, 0x3e, 0x98, 0xf4, - 0x1b, 0x4f, 0xc8, 0x11, 0x1c, 0x66, 0x5b, 0x05, 0x57, 0x3c, 0xd3, 0xe7, 0xe6, 0xa5, 0x79, 0xbd, - 0x7f, 0x73, 0x4c, 0x77, 0x0e, 0x74, 0xda, 0x11, 0xc1, 0xde, 0xba, 0x76, 0x8d, 0xd9, 0x20, 0xf3, - 0xde, 0x6d, 0xab, 0xc7, 0x9d, 0xdc, 0x3e, 0x8a, 0x01, 0x5e, 0x0a, 0x50, 0x21, 0xe4, 0xc8, 0x05, - 0x74, 0x16, 0xa3, 0x60, 0xb2, 0xd5, 0x7f, 0xd5, 0xee, 0x95, 0x48, 0xf0, 0xad, 0x9c, 0xd3, 0x50, - 0x66, 0x2c, 0x94, 0x3a, 0x93, 0x7a, 0x28, 0xbe, 0x8e, 0x16, 0x0c, 0x57, 0x05, 0x68, 0xfa, 0x00, - 0xe1, 0x4f, 0xed, 0x9e, 0xae, 0x78, 0x96, 0xde, 0x79, 0xff, 0xdd, 0xbc, 0xd9, 0x61, 0x0c, 0x30, - 0xdd, 0xcd, 0xc1, 0xeb, 0xba, 0x21, 0xe6, 0xa6, 0x21, 0xe6, 0x77, 0x43, 0xcc, 0x8f, 0x96, 0x18, - 0x9b, 0x96, 0x18, 0x9f, 0x2d, 0x31, 0x9e, 0x1f, 0xff, 0x5c, 0xd2, 0xa8, 0x78, 0x2e, 0x20, 0x95, - 0x15, 0xf8, 0x15, 0xe4, 0x58, 0x2a, 0xd0, 0xac, 0xe0, 0xe1, 0x02, 0xd0, 0x8f, 0xa5, 0x5a, 0x72, - 0x15, 0xf9, 0x59, 0x12, 0x45, 0x29, 0x2c, 0xb9, 0x02, 0x36, 0x04, 0xd9, 0x7d, 0x33, 0xb7, 0xba, - 0x8c, 0x6e, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xb6, 0xa0, 0x89, 0x70, 0x5f, 0x01, 0x00, 0x00, + 0xd6, 0x9b, 0x17, 0x21, 0x08, 0xc5, 0x5b, 0xa9, 0x37, 0x2f, 0xb2, 0xdd, 0x4c, 0xd6, 0xd0, 0x24, + 0x1b, 0x76, 0x37, 0xa9, 0xfd, 0x17, 0xfe, 0xac, 0x1e, 0x7b, 0x14, 0x0f, 0x41, 0x92, 0x7f, 0xe0, + 0x2f, 0x90, 0x6e, 0x42, 0xd1, 0xd3, 0xcc, 0xbc, 0xf7, 0xe6, 0xcd, 0xf0, 0xdc, 0x0b, 0x29, 0x2a, + 0x0d, 0x92, 0xd4, 0x63, 0xc2, 0xa1, 0x00, 0x95, 0x2a, 0x5c, 0x4a, 0xa1, 0x85, 0x37, 0xea, 0x09, + 0x5c, 0x8f, 0xaf, 0xce, 0xb8, 0xe0, 0xc2, 0xa0, 0x64, 0xd7, 0xf5, 0x82, 0xe0, 0xc1, 0x3d, 0x9a, + 0xf6, 0x1b, 0xcf, 0x9a, 0x6a, 0xf0, 0x88, 0xeb, 0x94, 0x54, 0xd2, 0x5c, 0x5d, 0xda, 0xd7, 0xf6, + 0xed, 0xe1, 0xe4, 0x14, 0xef, 0x1d, 0xf0, 0xcc, 0x10, 0xd1, 0xc1, 0xa6, 0xf1, 0xad, 0xf9, 0x20, + 0x0b, 0xde, 0x5d, 0xa7, 0xc7, 0xbd, 0xc2, 0x3d, 0x49, 0x00, 0x5e, 0x4b, 0x90, 0x0c, 0x0a, 0x4d, + 0x39, 0x18, 0x8b, 0x51, 0x34, 0xdd, 0xe9, 0xbf, 0x1a, 0xff, 0x86, 0xa7, 0xfa, 0xad, 0x5a, 0x60, + 0x26, 0x72, 0xc2, 0x84, 0xca, 0x85, 0x1a, 0x4a, 0xa8, 0xe2, 0x25, 0xd1, 0xeb, 0x12, 0x14, 0x7e, + 0x04, 0xf6, 0xd3, 0xf8, 0xe7, 0x6b, 0x9a, 0x67, 0xf7, 0xc1, 0x7f, 0xb7, 0x60, 0x7e, 0x9c, 0x00, + 0xcc, 0xf6, 0x73, 0xc4, 0x36, 0x2d, 0xb2, 0xb7, 0x2d, 0xb2, 0xbf, 0x5b, 0x64, 0x7f, 0x74, 0xc8, + 0xda, 0x76, 0xc8, 0xfa, 0xec, 0x90, 0xf5, 0xf2, 0xf4, 0xe7, 0x92, 0xd2, 0x92, 0x16, 0x1c, 0x32, + 0x51, 0x43, 0x58, 0x43, 0xa1, 0x2b, 0x09, 0x8a, 0x94, 0x94, 0x2d, 0x41, 0x87, 0x89, 0x90, 0x2b, + 0x2a, 0xe3, 0x30, 0x4f, 0xe3, 0x38, 0x83, 0x15, 0x95, 0x40, 0xea, 0x09, 0x19, 0xb2, 0x34, 0x0f, + 0x2d, 0x1c, 0x13, 0xd3, 0xdd, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0c, 0x58, 0x6d, 0x0c, 0x62, + 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/router/types/query.pb.go b/router/types/query.pb.go index fa62c8c..d03fc51 100644 --- a/router/types/query.pb.go +++ b/router/types/query.pb.go @@ -121,25 +121,25 @@ func init() { proto.RegisterFile("router/v1/query.proto", fileDescriptor_8961e0c var fileDescriptor_8961e0cabda3d9d6 = []byte{ // 297 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0xb1, 0x4e, 0xeb, 0x30, - 0x14, 0x86, 0x9b, 0x2b, 0xdd, 0x4a, 0x98, 0x09, 0x53, 0x04, 0x8a, 0x8a, 0x85, 0x32, 0xc1, 0xd0, - 0x58, 0x2d, 0x2f, 0x80, 0x18, 0x98, 0x81, 0x91, 0x09, 0x37, 0x39, 0x18, 0xab, 0x89, 0x8f, 0x6b, - 0x3b, 0xa9, 0xba, 0xf2, 0x04, 0x48, 0xbc, 0x14, 0x63, 0x25, 0x16, 0x46, 0x94, 0xf0, 0x20, 0xa8, - 0x49, 0xa0, 0x20, 0xc4, 0x66, 0xfd, 0xff, 0x67, 0x7f, 0x3e, 0x87, 0xec, 0x59, 0x2c, 0x3c, 0x58, - 0x5e, 0x8e, 0xf9, 0xbc, 0x00, 0xbb, 0x8c, 0x8d, 0x45, 0x8f, 0x74, 0xab, 0x8d, 0xe3, 0x72, 0x1c, - 0x0e, 0x24, 0x4a, 0x6c, 0x52, 0xbe, 0x3e, 0xb5, 0x40, 0xb8, 0xbf, 0xb9, 0x27, 0x41, 0x83, 0x53, - 0xae, 0x2b, 0x86, 0x12, 0x51, 0x66, 0xc0, 0x85, 0x51, 0x5c, 0x68, 0x8d, 0x5e, 0x78, 0x85, 0xba, - 0x6b, 0xa3, 0x01, 0xa1, 0x57, 0x6b, 0xcd, 0xa5, 0xb0, 0x22, 0x77, 0xd7, 0x30, 0x2f, 0xc0, 0xf9, - 0xe8, 0x8c, 0xec, 0xfe, 0x48, 0x9d, 0x41, 0xed, 0x80, 0x9e, 0x90, 0xbe, 0x69, 0x92, 0x83, 0xe0, - 0x28, 0x38, 0xde, 0x9e, 0xec, 0xc4, 0x5f, 0xbf, 0x8a, 0x3b, 0xb4, 0x03, 0x26, 0x9e, 0xfc, 0x6f, - 0x5e, 0xa0, 0x33, 0xd2, 0x6f, 0x2b, 0x7a, 0xf8, 0x8d, 0xfe, 0xed, 0x0c, 0xd9, 0x5f, 0x75, 0x2b, - 0x8f, 0xa2, 0x87, 0x97, 0xf7, 0xa7, 0x7f, 0x43, 0x1a, 0x72, 0x35, 0x4d, 0xb8, 0x30, 0xc6, 0xf1, - 0xcd, 0xc8, 0xad, 0xf5, 0xfc, 0xf6, 0xb9, 0x62, 0xc1, 0xaa, 0x62, 0xc1, 0x5b, 0xc5, 0x82, 0xc7, - 0x9a, 0xf5, 0x56, 0x35, 0xeb, 0xbd, 0xd6, 0xac, 0x77, 0x73, 0x21, 0x95, 0xbf, 0x2f, 0xa6, 0x71, - 0x82, 0x39, 0x77, 0xde, 0x0a, 0x2d, 0x21, 0xc3, 0x12, 0x46, 0x25, 0x68, 0x5f, 0x58, 0x70, 0xdc, - 0x88, 0x64, 0x06, 0x7e, 0x74, 0x87, 0x76, 0x21, 0x6c, 0x3a, 0xca, 0x55, 0x9a, 0x66, 0xb0, 0x10, - 0x16, 0x3e, 0x2d, 0x7e, 0x69, 0xc0, 0x4d, 0xfb, 0xcd, 0xda, 0x4e, 0x3f, 0x02, 0x00, 0x00, 0xff, - 0xff, 0xf9, 0x8c, 0xbe, 0xa9, 0xa7, 0x01, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0x31, 0x4e, 0xc3, 0x30, + 0x14, 0x86, 0x1b, 0x24, 0x2a, 0x61, 0x26, 0x4c, 0x11, 0x28, 0x2a, 0x16, 0xca, 0x04, 0x43, 0x63, + 0xb5, 0x5c, 0x00, 0xb1, 0xb1, 0x01, 0x23, 0x9b, 0x9b, 0x3c, 0x8c, 0xd5, 0xc4, 0xcf, 0xb5, 0x9d, + 0x54, 0x5d, 0x39, 0x01, 0x12, 0x97, 0x62, 0xac, 0xc4, 0xc2, 0x88, 0x12, 0x0e, 0x82, 0x9a, 0x04, + 0x0a, 0x42, 0x6c, 0xd6, 0xff, 0x7f, 0xf6, 0xe7, 0xf7, 0xc8, 0x81, 0xc5, 0xc2, 0x83, 0xe5, 0xe5, + 0x98, 0xcf, 0x0b, 0xb0, 0xcb, 0xd8, 0x58, 0xf4, 0x48, 0x77, 0xda, 0x38, 0x2e, 0xc7, 0xe1, 0x40, + 0xa2, 0xc4, 0x26, 0xe5, 0xeb, 0x53, 0x0b, 0x84, 0x87, 0x9b, 0x7b, 0x12, 0x34, 0x38, 0xe5, 0xba, + 0x62, 0x28, 0x11, 0x65, 0x06, 0x5c, 0x18, 0xc5, 0x85, 0xd6, 0xe8, 0x85, 0x57, 0xa8, 0xbb, 0x36, + 0x1a, 0x10, 0x7a, 0xb3, 0xd6, 0x5c, 0x0b, 0x2b, 0x72, 0x77, 0x0b, 0xf3, 0x02, 0x9c, 0x8f, 0x2e, + 0xc8, 0xfe, 0xaf, 0xd4, 0x19, 0xd4, 0x0e, 0xe8, 0x19, 0xe9, 0x9b, 0x26, 0x39, 0x0a, 0x4e, 0x82, + 0xd3, 0xdd, 0xc9, 0x5e, 0xfc, 0xfd, 0xab, 0xb8, 0x43, 0x3b, 0x60, 0xe2, 0xc9, 0x76, 0xf3, 0x02, + 0x9d, 0x91, 0x7e, 0x5b, 0xd1, 0xe3, 0x1f, 0xf4, 0x5f, 0x67, 0xc8, 0xfe, 0xab, 0x5b, 0x79, 0x14, + 0x3d, 0xbe, 0x7e, 0x3c, 0x6f, 0x0d, 0x69, 0xc8, 0xd5, 0x34, 0xe1, 0xc2, 0x18, 0xc7, 0x37, 0x23, + 0xb7, 0xd6, 0xcb, 0xe4, 0xa5, 0x62, 0xc1, 0xaa, 0x62, 0xc1, 0x7b, 0xc5, 0x82, 0xa7, 0x9a, 0xf5, + 0x56, 0x35, 0xeb, 0xbd, 0xd5, 0xac, 0x77, 0x77, 0x25, 0x95, 0x7f, 0x28, 0xa6, 0x71, 0x82, 0x39, + 0x77, 0xde, 0x0a, 0x2d, 0x21, 0xc3, 0x12, 0x46, 0x25, 0x68, 0x5f, 0x58, 0x70, 0xdc, 0x88, 0x64, + 0x06, 0x7e, 0x74, 0x8f, 0x76, 0x21, 0x6c, 0x3a, 0xca, 0x55, 0x9a, 0x66, 0xb0, 0x10, 0x16, 0x78, + 0x39, 0xf9, 0x12, 0xf9, 0xa5, 0x01, 0x37, 0xed, 0x37, 0x9b, 0x3b, 0xff, 0x0c, 0x00, 0x00, 0xff, + 0xff, 0x89, 0x5c, 0x27, 0xf6, 0xaa, 0x01, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index 51b4aaa..7950c6e 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -26,5 +26,5 @@ Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. \ done # move proto files to the right places -cp -r github.com/strangelove-ventures/packet-forward-middleware/router/* router/ +cp -r github.com/strangelove-ventures/packet-forward-middleware/v2/router/* router/ rm -rf github.com