Refactor build address cmd (#2101)

Author: pinosu

scripts/contrib/local/02-contracts.sh

@@ -43,8 +43,7 @@ RESP=$(wasmd tx wasm instantiate2 "$CODE_ID" "$INIT" $(echo -n "testing" | xxd -
 sleep 6
 wasmd q tx $(echo "$RESP"| jq -r '.txhash') -o json | jq
 
-
-predictedAddress=$(wasmd q wasm build-address "$CODE_HASH" $(wasmd keys show validator -a --keyring-backend=test) $(echo -n "testing" | xxd -ps) "$INIT" | awk '{print $2}')
+predictedAddress=$(wasmd q wasm build-address "$CODE_HASH" $(wasmd keys show validator -a --keyring-backend=test) $(echo -n "testing" | xxd -ps) "$INIT")
 wasmd q wasm contract "$predictedAddress" -o json | jq
 
 echo "### Query all"

x/wasm/client/cli/query.go

@@ -18,6 +18,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
+	"github.com/CosmWasm/wasmd/x/wasm/keeper"
 	"github.com/CosmWasm/wasmd/x/wasm/types"
 )
 
@@ -77,19 +78,12 @@ func GetCmdBuildAddress() *cobra.Command {
 		Aliases: []string{"address"},
 		Args:    cobra.RangeArgs(3, 4),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx, err := client.GetClientQueryContext(cmd)
-			if err != nil {
-				return err
-			}
-
 			var initArgs []byte
 			if len(args) == 4 {
 				initArgs = types.RawContractMessage(args[3])
 			}
 
-			queryClient := types.NewQueryClient(clientCtx)
-			res, err := queryClient.BuildAddress(
-				context.Background(),
+			res, err := keeper.BuildAddressPredictable(
 				&types.QueryBuildAddressRequest{
 					CodeHash:       args[0],
 					CreatorAddress: args[1],
@@ -100,7 +94,8 @@ func GetCmdBuildAddress() *cobra.Command {
 			if err != nil {
 				return err
 			}
-			return clientCtx.PrintProto(res)
+			fmt.Println(res.Address)
+			return nil
 		},
 		SilenceUsage: true,
 	}

x/wasm/keeper/querier.go

@@ -452,6 +452,12 @@ func (q GrpcQuerier) WasmLimitsConfig(c context.Context, req *types.QueryWasmLim
 }
 
 func (q GrpcQuerier) BuildAddress(c context.Context, req *types.QueryBuildAddressRequest) (*types.QueryBuildAddressResponse, error) {
+	ctx := sdk.UnwrapSDKContext(c)
+	defer ctx.GasMeter().ConsumeGas(DefaultGasCostBuildAddress, "build address")
+	return BuildAddressPredictable(req)
+}
+
+func BuildAddressPredictable(req *types.QueryBuildAddressRequest) (*types.QueryBuildAddressResponse, error) {
 	if req == nil {
 		return nil, status.Error(codes.InvalidArgument, "empty request")
 	}
@@ -471,9 +477,6 @@ func (q GrpcQuerier) BuildAddress(c context.Context, req *types.QueryBuildAddres
 		return nil, status.Error(codes.InvalidArgument, "empty salt")
 	}
 
-	ctx := sdk.UnwrapSDKContext(c)
-	defer ctx.GasMeter().ConsumeGas(DefaultGasCostBuildAddress, "build address")
-
 	if req.InitArgs == nil {
 		return &types.QueryBuildAddressResponse{
 			Address: BuildContractAddressPredictable(codeHash, creator, salt, []byte{}).String(),