update the dns module to the version of cosmos-sdk v0.40.0-rc3

.github/workflows/test.yml

@@ -6,16 +6,21 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-
-    - name: Set up Go 1.14
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.14
-      id: go
-
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
-
+    - name: Setup Go environment
+      uses: actions/[email protected]
+      with:
+        go-version: 1.15
+      id: go
+    - name: cache
+      id: cache
+      uses: actions/cache@v2
+      with:
+        path: ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: |
+          ${{ runner.os }}-go-
     - name: Build
       run: make build
 

go.mod

@@ -1,31 +1,23 @@
 module github.com/datachainlab/cosmos-sdk-interchain-dns
 
-go 1.14
+go 1.15
 
 require (
-	github.com/cosmos/cosmos-sdk v0.34.4-0.20200829142048-5ee4fad5010e
-	github.com/gibson042/canonicaljson-go v1.0.3 // indirect
+	github.com/cosmos/cosmos-sdk v0.40.0-rc2
 	github.com/gogo/protobuf v1.3.1
-	github.com/golang/protobuf v1.4.2
+	github.com/golang/protobuf v1.4.3
 	github.com/gorilla/mux v1.8.0
-	github.com/grpc-ecosystem/grpc-gateway v1.14.7
-	github.com/otiai10/copy v1.2.0
+	github.com/grpc-ecosystem/grpc-gateway v1.15.2
+	github.com/rakyll/statik v0.1.7
 	github.com/spf13/cast v1.3.1
-	github.com/spf13/cobra v1.0.0
+	github.com/spf13/cobra v1.1.1
 	github.com/spf13/viper v1.7.1
 	github.com/stretchr/testify v1.6.1
-	github.com/tendermint/btcd v0.1.1
-	github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15
-	github.com/tendermint/go-amino v0.15.1
-	github.com/tendermint/tendermint v0.34.0-rc3
+	github.com/tendermint/tendermint v0.34.0-rc5
 	github.com/tendermint/tm-db v0.6.2
-	google.golang.org/genproto v0.0.0-20200825200019-8632dd797987
-	google.golang.org/grpc v1.31.1
-	rsc.io/quote/v3 v3.1.0 // indirect
+	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
+	google.golang.org/genproto v0.0.0-20201014134559-03b6142f0dc9
+	google.golang.org/grpc v1.33.0
 )
 
-replace github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.34.4-0.20200829142048-5ee4fad5010e
-
-replace github.com/tendermint/tendermint => github.com/tendermint/tendermint v0.34.0-rc3
-
 replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.2-alpha.regen.4

proto/ibc/dns/client/types.proto

@@ -6,6 +6,12 @@ option go_package = "github.com/datachainlab/cosmos-sdk-interchain-dns/x/ibc-dns
 import "gogoproto/gogo.proto";
 import "ibc/dns/common/types.proto";
 
+// Msg defines the ibc/transfer Msg service.
+service Msg {
+    rpc RegisterDomain(MsgRegisterDomain) returns (MsgRegisterDomainResponse);
+    rpc DomainAssociationCreate(MsgDomainAssociationCreate) returns (MsgDomainAssociationCreateResponse);
+}
+
 message MsgRegisterDomain {
     option (gogoproto.goproto_getters) = false;
     // the port on which the packet will be sent
@@ -18,16 +24,14 @@ message MsgRegisterDomain {
     ];
     string domain = 3;
     bytes metadata = 4;
-    bytes sender = 5 [
-        (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"
-    ];
+    bytes sender = 5;
 }
 
+message MsgRegisterDomainResponse { }
+
 message MsgDomainAssociationCreate {
     option (gogoproto.goproto_getters) = false;
-    bytes sender = 1 [
-        (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"
-    ];
+    bytes sender = 1;
     ibc.dns.common.LocalDNSID dns_id = 2 [
         (gogoproto.nullable) = false
     ];
@@ -38,3 +42,5 @@ message MsgDomainAssociationCreate {
         (gogoproto.nullable) = false
     ];
 }
+
+message MsgDomainAssociationCreateResponse { }

scripts/protocgen.sh

@@ -3,13 +3,11 @@
 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 . -path ./third_party -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq)
 for dir in $proto_dirs; do
   protoc \
   -I "proto" \
   -I "third_party/proto" \
-  -I "$cosmos_sdk_dir" \
   --gocosmos_out=plugins=interfacetype+grpc,\
 Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. \
   $(find "${dir}" -name '*.proto')
@@ -18,7 +16,6 @@ Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. \
   protoc \
   -I "proto" \
   -I "third_party/proto" \
-  -I "$cosmos_sdk_dir" \
   --grpc-gateway_out=logtostderr=true:. \
   $(find "${dir}" -maxdepth 1 -name '*.proto')
 done