Skip to content

Commit

Permalink
feat(depinject): support for core (#5976)
Browse files Browse the repository at this point in the history
* wip: depinject ibc core module configuration

* fix import cosmos/app/v1alpha1 import

* fix wrong merge

* add generation of pulsar files

* remove previously generated proto file

* add api import in go.mod

* add api import to e2e

* remove wrong import

* some go.mod chores

* remove code that should come in a different PR

* update pulsar files

* api go mod tidy

* move to depinject.go

* lint fix

* replace api for 08-wasm

* replace api for callbacks

* e2e go mod tidy

* copy api module to /go

* chore: consolidate protogen scripts

* review comments

* replace staking keeper with consensus host in module inputs

* downgrade api module to go 1.21

* Revert "downgrade api module to go 1.21"

This reverts commit b56e330.

* downgrade go to 1.21 in api module and update ics23 replace commit

* remove pb.go files

---------

Co-authored-by: Damian Nolan <[email protected]>
  • Loading branch information
crodriguezvega and damiannolan authored Apr 18, 2024
1 parent 71233e5 commit fdb29a2
Show file tree
Hide file tree
Showing 13 changed files with 687 additions and 10 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ RUN test -n "${IBC_GO_VERSION}"

# Copy relevant files before go mod download. Replace directives to local paths break if local
# files are not copied before go mod download.
ADD api api
ADD internal internal
ADD testing testing
ADD modules modules
Expand Down
6 changes: 3 additions & 3 deletions api/go.mod
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
module github.com/cosmos/ibc-go/api

go 1.22.0
go 1.21

// NOTE: This replace points the ics23 code deps used by 23-commitment to a branch using pulsar codegen (i.e. protov2 compatible encoding interfaces)
// This should be removed and reverted when depinject supports protov1 with gogoproto.
replace github.com/cosmos/ics23/go/api => github.com/cosmos/ics23/go/api v0.0.0-20240417162222-d137921f67b6
replace github.com/cosmos/ics23/go/api => github.com/cosmos/ics23/go/api v0.0.0-20240418174942-ccce00eba150

require (
cosmossdk.io/api v0.7.2
github.com/cosmos/cosmos-proto v1.0.0-beta.4
github.com/cosmos/gogoproto v1.4.11
github.com/cosmos/ics23/go/api v0.0.0
google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a
google.golang.org/grpc v1.59.0
google.golang.org/protobuf v1.33.0
)

Expand All @@ -24,5 +25,4 @@ require (
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
google.golang.org/grpc v1.59.0 // indirect
)
4 changes: 2 additions & 2 deletions api/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ github.com/cosmos/cosmos-proto v1.0.0-beta.4 h1:aEL7tU/rLOmxZQ9z4i7mzxcLbSCY48Od
github.com/cosmos/cosmos-proto v1.0.0-beta.4/go.mod h1:oeB+FyVzG3XrQJbJng0EnV8Vljfk9XvTIpGILNU/9Co=
github.com/cosmos/gogoproto v1.4.11 h1:LZcMHrx4FjUgrqQSWeaGC1v/TeuVFqSLa43CC6aWR2g=
github.com/cosmos/gogoproto v1.4.11/go.mod h1:/g39Mh8m17X8Q/GDEs5zYTSNaNnInBSohtaxzQnYq1Y=
github.com/cosmos/ics23/go/api v0.0.0-20240417162222-d137921f67b6 h1:cPC1qMDSDWseBhHklSYXGcB/tbmw1J5BxGdqSbF/ED8=
github.com/cosmos/ics23/go/api v0.0.0-20240417162222-d137921f67b6/go.mod h1:4crp9SaEZDYXZlr0ennsDKEe08EPE5mxAKhOmUWYYNI=
github.com/cosmos/ics23/go/api v0.0.0-20240418174942-ccce00eba150 h1:7I4KVIRmT9VAiGJFwD+8yMu9ecEWlUZVdqPpPTNaEjE=
github.com/cosmos/ics23/go/api v0.0.0-20240418174942-ccce00eba150/go.mod h1:FpETw40u/nTgyoOxCdh0kOk38N7f4Ec/Z77nICQm/TE=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
Expand Down
Loading

0 comments on commit fdb29a2

Please sign in to comment.