#303 Upgrade Cosmos-SDK to v0.47.3

- Modify BroadcastTx method
- Enable external access of REST and gRPC endpoints

Signed-off-by: Abdulbois <abdulbois.tursunov@dsr-corporation.com>
Signed-off-by: Abdulbois <abdulbois123@gmail.com>

Author: Abdulbois

cmd/dcld/cmd/root.go

@@ -184,7 +184,6 @@ func initRootCmd(
 		txCommand(),
 		keys.Commands(app.DefaultNodeHome),
 	)
-
 }
 
 // queryCommand returns the sub-command to send queries to the app.

genlocalnetconfig.sh

@@ -173,6 +173,10 @@ for node_name in node0 node1 node2 node3 observer0; do
     if [[ -d "$LOCALNET_DIR/${node_name}" ]]; then
         # Make RPC endpoints available externally
         sed -i $SED_EXT 's/laddr = "tcp:\/\/127.0.0.1:26657"/laddr = "tcp:\/\/0.0.0.0:26657"/g' "$LOCALNET_DIR/${node_name}/config/config.toml"
+        # Make REST endpoints available externally
+        sed -i $SED_EXT 's/address = "tcp:\/\/localhost:1317"/address = "tcp:\/\/0.0.0.0:1317"/g' "$LOCALNET_DIR/${node_name}/config/app.toml"
+        # Make gRPC endpoints available externally
+        sed -i $SED_EXT 's/address = "localhost:9090"/address = "0.0.0.0:9090"/g' "$LOCALNET_DIR/${node_name}/config/app.toml"
 
         # sets proper moniker
         sed -i $SED_EXT "s/moniker = .*/moniker = \"$node_name\"/g" "$LOCALNET_DIR/${node_name}/config/config.toml"

integration_tests/run-all.sh

@@ -76,7 +76,7 @@ init_pool() {
   make localnet_start &>${DETAILED_OUTPUT_TARGET}
 
   log "-> Waiting for the second block (needed to request proofs)" >${DETAILED_OUTPUT_TARGET}
-  sleep 10
+  sleep 20
   wait_for_height 2 20
 }
 

integration_tests/utils/grpc_rest.go

@@ -21,16 +21,18 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
+	"time"
 
-	//nolint:staticcheck
-	"github.com/golang/protobuf/proto"
+	"github.com/cosmos/gogoproto/proto"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
 	sdkerrors "cosmossdk.io/errors"
 	clienttx "github.com/cosmos/cosmos-sdk/client/tx"
+	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/tx"
@@ -59,6 +61,7 @@ func (suite *TestSuite) GetGRPCConn() *grpc.ClientConn {
 	grpcConn, err := grpc.Dial(
 		"127.0.0.1:26630", // Or your gRPC server address.
 		grpc.WithTransportCredentials(insecure.NewCredentials()), // The SDK doesn't support any transport security mechanism.
+		grpc.WithDefaultCallOptions(grpc.ForceCodec(codec.NewProtoCodec(suite.EncodingConfig.InterfaceRegistry).GRPCCodec())),
 	)
 	require.NoError(suite.T, err)
 
@@ -144,21 +147,30 @@ func (suite *TestSuite) BroadcastTx(txBytes []byte) (*sdk.TxResponse, error) {
 		TxBytes: txBytes,
 	}
 
-	if suite.Rest {
-		var _resp tx.GetTxResponse
+	if suite.Rest { //nolint:nestif
+		var _getResp tx.GetTxResponse
+		var _brdResp tx.BroadcastTxResponse
 
 		bodyBytes, err := suite.EncodingConfig.Codec.MarshalJSON(&body)
 		require.NoError(suite.T, err)
 
-		_, err = SendPostRequest("/cosmos/tx/v1beta1/txs", bodyBytes, "", "")
+		respBytes, err := SendPostRequest("/cosmos/tx/v1beta1/txs", bodyBytes, "", "")
+		require.NoError(suite.T, err)
+		require.NoError(suite.T, suite.EncodingConfig.Codec.UnmarshalJSON(respBytes, &_brdResp))
+
+		for i := 1; i <= 10; i++ {
+			respBytes, err = SendGetRequest(fmt.Sprintf("/cosmos/tx/v1beta1/txs/%s", _brdResp.GetTxResponse().TxHash))
+			if err == nil {
+				require.NoError(suite.T, suite.EncodingConfig.Codec.UnmarshalJSON(respBytes, &_getResp))
+
+				break
+			}
+			time.Sleep(2 * time.Second)
+		}
 		if err != nil {
 			return nil, err
 		}
-
-		respBytes, err := SendGetRequest(fmt.Sprintf("/cosmos/tx/v1beta1/txs/%s", _resp.GetTxResponse().TxHash))
-		require.NoError(suite.T, err)
-		require.NoError(suite.T, suite.EncodingConfig.Codec.UnmarshalJSON(respBytes, &_resp))
-		txResponse = &_resp
+		txResponse = &_getResp
 	} else {
 		grpcConn := suite.GetGRPCConn()
 		defer grpcConn.Close()
@@ -171,7 +183,13 @@ func (suite *TestSuite) BroadcastTx(txBytes []byte) (*sdk.TxResponse, error) {
 			return nil, err
 		}
 
-		txResponse, err = txClient.GetTx(context.Background(), &tx.GetTxRequest{Hash: broadCastResponse.GetTxResponse().TxHash})
+		for i := 1; i <= 10; i++ {
+			txResponse, err = txClient.GetTx(context.Background(), &tx.GetTxRequest{Hash: broadCastResponse.GetTxResponse().TxHash})
+			if err == nil && !strings.Contains(txResponse.TxResponse.RawLog, "tx not found") {
+				break
+			}
+			time.Sleep(2 * time.Second)
+		}
 		if err != nil {
 			return nil, err
 		}
@@ -209,7 +227,7 @@ func (suite *TestSuite) QueryREST(uri string, resp proto.Message) error {
 
 func (suite *TestSuite) AssertNotFound(err error) {
 	require.Error(suite.T, err)
-	require.Contains(suite.T, err.Error(), "rpc error: code = NotFound desc = not found")
+	require.Contains(suite.T, err.Error(), "not found")
 
 	if suite.Rest {
 		var resterr *RESTError