Skip to content

Commit

Permalink
Revert "Penumbra support v2 (cosmos#1144)"
Browse files Browse the repository at this point in the history
This reverts commit c687408.
  • Loading branch information
boojamya committed Apr 7, 2023
1 parent d619c89 commit 7b7e216
Show file tree
Hide file tree
Showing 43 changed files with 405 additions and 75,241 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ifeq ($(OS),Windows_NT)
@go build -mod=readonly $(BUILD_FLAGS) -o build/rly.exe main.go
else
@echo "building rly binary..."
@go build $(BUILD_FLAGS) -o build/rly main.go
@go build -mod=readonly $(BUILD_FLAGS) -o build/rly main.go
endif

build-zip: go.sum
Expand Down
4 changes: 4 additions & 0 deletions buf.work.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
version: v1
directories:
- proto
- third_party/proto
6 changes: 1 addition & 5 deletions cmd/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (

"github.com/cosmos/relayer/v2/relayer"
"github.com/cosmos/relayer/v2/relayer/chains/cosmos"
"github.com/cosmos/relayer/v2/relayer/chains/penumbra"
"github.com/cosmos/relayer/v2/relayer/provider"
"github.com/spf13/cobra"
"go.uber.org/zap"
Expand Down Expand Up @@ -374,8 +373,7 @@ type ProviderConfigYAMLWrapper struct {
// NOTE: Add new ProviderConfig types in the map here with the key set equal to the type of ChainProvider (e.g. cosmos, substrate, etc.)
func (pcw *ProviderConfigWrapper) UnmarshalJSON(data []byte) error {
customTypes := map[string]reflect.Type{
"cosmos": reflect.TypeOf(cosmos.CosmosProviderConfig{}),
"penumbra": reflect.TypeOf(penumbra.PenumbraProviderConfig{}),
"cosmos": reflect.TypeOf(cosmos.CosmosProviderConfig{}),
}
val, err := UnmarshalJSONProviderConfig(data, customTypes)
if err != nil {
Expand Down Expand Up @@ -428,8 +426,6 @@ func (iw *ProviderConfigYAMLWrapper) UnmarshalYAML(n *yaml.Node) error {
switch iw.Type {
case "cosmos":
iw.Value = new(cosmos.CosmosProviderConfig)
case "penumbra":
iw.Value = new(penumbra.PenumbraProviderConfig)
default:
return fmt.Errorf("%s is an invalid chain type, check your config file", iw.Type)
}
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ require (
github.com/cosmos/go-bip39 v1.0.0
github.com/cosmos/gogoproto v1.4.6
github.com/cosmos/ibc-go/v7 v7.0.0
github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab
github.com/ethereum/go-ethereum v1.10.26
github.com/gofrs/flock v0.8.1
github.com/gogo/protobuf v1.3.2
Expand All @@ -35,7 +34,6 @@ require (
golang.org/x/term v0.6.0
golang.org/x/text v0.8.0
google.golang.org/grpc v1.53.0
google.golang.org/protobuf v1.29.1
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
)
Expand Down Expand Up @@ -71,6 +69,7 @@ require (
github.com/cosmos/btcutil v1.0.5 // indirect
github.com/cosmos/gogogateway v1.2.0 // indirect
github.com/cosmos/iavl v0.20.0 // indirect
github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab // indirect
github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect
github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect
github.com/creachadair/taskgroup v0.4.2 // indirect
Expand Down Expand Up @@ -176,6 +175,7 @@ require (
google.golang.org/api v0.110.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 // indirect
google.golang.org/protobuf v1.29.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
nhooyr.io/websocket v1.8.6 // indirect
pgregory.net/rapid v0.5.5 // indirect
Expand Down
4 changes: 0 additions & 4 deletions proto/buf.gen.gogo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@ version: v1
plugins:
- name: gocosmos
out: .
opt: plugins=grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types
- name: grpc-gateway
out: .
opt: logtostderr=true,allow_colon_final_segments=true
13 changes: 0 additions & 13 deletions proto/buf.gen.penumbra.yaml

This file was deleted.

31 changes: 0 additions & 31 deletions proto/buf.lock

This file was deleted.

7 changes: 0 additions & 7 deletions proto/buf.yaml

This file was deleted.

1 change: 1 addition & 0 deletions relayer/chains/cosmos/msg.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"go.uber.org/zap/zapcore"
)

var _ provider.RelayerMessage = &CosmosMessage{}

type CosmosMessage struct {
Msg sdk.Msg
Expand Down
1 change: 1 addition & 0 deletions relayer/chains/cosmos/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -689,6 +689,7 @@ func (cc *CosmosProvider) GenerateConnHandshakeProof(ctx context.Context, height
func (cc *CosmosProvider) QueryChannel(ctx context.Context, height int64, channelid, portid string) (chanRes *chantypes.QueryChannelResponse, err error) {
res, err := cc.queryChannelABCI(ctx, height, portid, channelid)
if err != nil && strings.Contains(err.Error(), "not found") {

return &chantypes.QueryChannelResponse{
Channel: &chantypes.Channel{
State: chantypes.UNINITIALIZED,
Expand Down
100 changes: 0 additions & 100 deletions relayer/chains/penumbra/codec.go

This file was deleted.

Loading

0 comments on commit 7b7e216

Please sign in to comment.