kick off the contract executor thing

go.mod

@@ -8,6 +8,7 @@ require (
 	cosmossdk.io/tools/rosetta v0.2.1
 	github.com/cometbft/cometbft v0.37.2
 	github.com/cometbft/cometbft-db v0.8.0
+	github.com/cosmos/cosmos-proto v1.0.0-beta.2
 	github.com/cosmos/cosmos-sdk v0.47.5
 	github.com/cosmos/gogoproto v1.4.10
 	github.com/cosmos/ibc-go/v7 v7.3.0
@@ -56,7 +57,6 @@ require (
 	github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect
 	github.com/confio/ics23/go v0.9.0 // indirect
 	github.com/cosmos/btcutil v1.0.5 // indirect
-	github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect
 	github.com/cosmos/go-bip39 v1.0.0 // indirect
 	github.com/cosmos/gogogateway v1.2.0 // indirect
 	github.com/cosmos/iavl v0.20.0 // indirect

proto/buf.gen.gogo.yaml

@@ -5,4 +5,4 @@ plugins:
     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
+    opt: logtostderr=true,allow_colon_final_segments=true

proto/buf.lock

@@ -5,23 +5,24 @@ deps:
     owner: cosmos
     repository: cosmos-proto
     commit: 1935555c206d4afb9e94615dfd0fad31
+    digest: shake256:c74d91a3ac7ae07d579e90eee33abf9b29664047ac8816500cf22c081fec0d72d62c89ce0bebafc1f6fec7aa5315be72606717740ca95007248425102c365377
   - remote: buf.build
     owner: cosmos
     repository: cosmos-sdk
-    commit: 7ea623782a4d4f11b35627913a7bc481
+    commit: 954f7b05f38440fc8250134b15adec47
+    digest: shake256:2ab4404fd04a7d1d52df0e2d0f2d477a3d83ffd88d876957bf3fedfd702c8e52833d65b3ce1d89a3c5adf2aab512616b0e4f51d8463f07eda9a8a3317ee3ac54
   - remote: buf.build
     owner: cosmos
     repository: gogo-proto
     commit: 34d970b699f84aa382f3c29773a60836
-  - remote: buf.build
-    owner: cosmos
-    repository: ibc
-    commit: f605ea4436e74eecb3c867b4f1c5b2b2
+    digest: shake256:3d3bee5229ba579e7d19ffe6e140986a228b48a8c7fe74348f308537ab95e9135210e81812489d42cd8941d33ff71f11583174ccc5972e86e6112924b6ce9f04
   - remote: buf.build
     owner: cosmos
     repository: ics23
     commit: 55085f7c710a45f58fa09947208eb70b
+    digest: shake256:9bf0bc495b5a11c88d163d39ef521bc4b00bc1374a05758c91d82821bdc61f09e8c2c51dda8452529bf80137f34d852561eacbe9550a59015d51cecb0dacb628
   - remote: buf.build
     owner: googleapis
     repository: googleapis
     commit: 8d7204855ec14631a499bd7393ce1970
+    digest: shake256:40bf4112960cad01281930beed85829910768e32e80e986791596853eccd42c0cbd9d96690b918f658020d2d427e16f8b6514e2ac7f4a10306fd32e77be44329

proto/buf.yaml

@@ -1,19 +1,11 @@
-# Generated by "buf config migrate-v1beta1". Edit as necessary, and
-# remove this comment when you're finished.
-#
-# This module represents the "proto" root found in
-# the previous configuration.
 version: v1
+name: buf.build/cosmos/interchain-accounts
 deps:
-  # TODO: update sdk buf dependency when v0.47.0 is tagged and pushed to BSR
-  # see: (https://github.com/cosmos/cosmos-sdk/tree/main/proto#sdk-x-buf)
   - buf.build/cosmos/cosmos-sdk:v0.47.0
   - buf.build/cosmos/cosmos-proto:1935555c206d4afb9e94615dfd0fad31
   - buf.build/cosmos/gogo-proto:a14993478f40695898ed8a86931094b6656e8a5d
   - buf.build/googleapis/googleapis:8d7204855ec14631a499bd7393ce1970
   - buf.build/cosmos/ics23:b1abd8678aab07165efd453c96796a179eb3131f
-  - buf.build/cosmos/ibc:89515bca6ec39e905648da42b411751a2c2b9ca0
-
 breaking:
   use:
     - FILE
@@ -28,3 +20,4 @@ lint:
     - SERVICE_SUFFIX
     - PACKAGE_VERSION_SUFFIX
     - RPC_REQUEST_STANDARD_NAME
+    - PACKAGE_DIRECTORY_MATCH

scripts/protocgen.sh

@@ -2,17 +2,15 @@
 
 set -eo pipefail
 
-# Get the path of the cosmos-sdk repo from go/pkg/mod
-# cosmos_sdk_dir=$(go list -f '{{ .Dir }}' -m github.com/cosmos/cosmos-sdk)
-proto_dirs=$(find ./proto -path -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq)
-for dir in $proto_dirs; do
-  buf alpha protoc \
-    -I "proto" \
-    -I "third_party/proto" \
-    --gocosmos_out=plugins=interfacetype+grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. \
-    --grpc-gateway_out=logtostderr=true:. \
-    $(find "${dir}" -maxdepth 1 -name '*.proto')
-done
+echo "Generating gogo proto code"
+cd proto
 
-cp -r github.com/cosmos/interchain-accounts/x/* x/
+buf generate --template buf.gen.gogo.yaml $file
+
+cd ..
+
+# move proto files to the right places
+cp -r github.com/cosmos/interchain-accounts/v*/x/* x/
 rm -rf github.com
+
+go mod tidy