Implement SIGN_MODE_DIRECT

.github/workflows/integration-test.yml

@@ -0,0 +1,54 @@
+name: CLI Tests
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+jobs:
+  cleanup-runs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: rokroskar/workflow-run-cleanup-action@master
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
+
+  protobuf:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: technote-space/get-diff-action@v1
+        id: git_diff
+        with:
+          SUFFIX_FILTER: |
+            .go
+            .mod
+            .sum
+      - name: build-sim
+        run: |
+          make build-sim
+        if: "env.GIT_DIFF != ''"
+      - name: cli-test
+        run: |
+          make test-integration
+        if: "env.GIT_DIFF != ''"
+
+  amino:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: technote-space/get-diff-action@v1
+        id: git_diff
+        with:
+          SUFFIX_FILTER: |
+            .go
+            .mod
+            .sum
+      - name: build-sim
+        run: |
+          make build-sim-amino
+        if: "env.GIT_DIFF != ''"
+      - name: cli-test
+        run: |
+          make test-integration-amino
+        if: "env.GIT_DIFF != ''"

.github/workflows/test.yml

@@ -15,9 +15,9 @@ jobs:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
     if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
 
-  split-test-files: 
+  split-test-files:
     runs-on: ubuntu-latest
-    steps: 
+    steps:
       - uses: actions/checkout@v2
       - name: Create a file with all the pkgs
         run: go list ./... > pkgs.txt
@@ -29,15 +29,15 @@ jobs:
           name: '${{ github.sha }}-aa'
           path: ./xaa.txt
       - uses: actions/upload-artifact@v2
-        with:          
+        with:
           name: '${{ github.sha }}-ab'
           path: ./xab.txt
       - uses: actions/upload-artifact@v2
-        with:        
+        with:
           name: '${{ github.sha }}-ac'
           path: ./xac.txt
       - uses: actions/upload-artifact@v2
-        with:        
+        with:
           name: '${{ github.sha }}-ad'
           path: ./xad.txt
 
@@ -53,7 +53,7 @@ jobs:
           SUFFIX_FILTER: |
             .go
             .mod
-            .sum      
+            .sum
       - uses: actions/download-artifact@v2
         with:
           name: '${{ github.sha }}-aa'
@@ -76,8 +76,8 @@ jobs:
       - uses: codecov/codecov-action@v1
         with:
           file: ./coverage.txt
-          fail_ci_if_error: true  
-        if: "env.GIT_DIFF != ''"      
+          fail_ci_if_error: true
+        if: "env.GIT_DIFF != ''"
 
   test-coverage-run-2:
     runs-on: ubuntu-latest
@@ -91,7 +91,7 @@ jobs:
           SUFFIX_FILTER: |
             .go
             .mod
-            .sum      
+            .sum
       - uses: actions/download-artifact@v2
         with:
           name: '${{ github.sha }}-ab'
@@ -114,8 +114,8 @@ jobs:
       - uses: codecov/codecov-action@v1
         with:
           file: ./coverage.txt
-          fail_ci_if_error: true  
-        if: "env.GIT_DIFF != ''"   
+          fail_ci_if_error: true
+        if: "env.GIT_DIFF != ''"
 
   test-coverage-run-3:
     runs-on: ubuntu-latest
@@ -129,7 +129,7 @@ jobs:
           SUFFIX_FILTER: |
             .go
             .mod
-            .sum      
+            .sum
       - uses: actions/download-artifact@v2
         with:
           name: '${{ github.sha }}-ac'
@@ -152,8 +152,8 @@ jobs:
       - uses: codecov/codecov-action@v1
         with:
           file: ./coverage.txt
-          fail_ci_if_error: true  
-        if: "env.GIT_DIFF != ''"      
+          fail_ci_if_error: true
+        if: "env.GIT_DIFF != ''"
 
   test-coverage-run-4:
     runs-on: ubuntu-latest
@@ -167,7 +167,7 @@ jobs:
           SUFFIX_FILTER: |
             .go
             .mod
-            .sum      
+            .sum
       - uses: actions/download-artifact@v2
         with:
           name: '${{ github.sha }}-ad'
@@ -190,13 +190,14 @@ jobs:
       - uses: codecov/codecov-action@v1
         with:
           file: ./coverage.txt
-          fail_ci_if_error: true  
-        if: "env.GIT_DIFF != ''"        
+          fail_ci_if_error: true
+        if: "env.GIT_DIFF != ''"
 
-  integration-tests:
+  amino:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
+      - uses: actions/setup-go@v2-beta
       - uses: actions/checkout@v2
       - uses: technote-space/get-diff-action@v1
         id: git_diff
@@ -205,11 +206,11 @@ jobs:
             .go
             .mod
             .sum
-      - name: build-sim
+      - name: build
         run: |
-          make build-sim
+          make build
         if: "env.GIT_DIFF != ''"
-      - name: cli-test
+      - name: unit tests
         run: |
-          make test-integration
+          go test ./... -mod=readonly -timeout 12m -race -coverprofile=coverage.txt -covermode=atomic -tags='ledger test_ledger_mock test_amino'
         if: "env.GIT_DIFF != ''"

Makefile

@@ -31,6 +31,11 @@ build-sim: go.sum
 	go build -mod=readonly $(BUILD_FLAGS) -o $(BUILDDIR) ./simapp/cmd/simd
 	go build -mod=readonly $(BUILD_FLAGS) -o $(BUILDDIR) ./simapp/cmd/simcli
 
+build-sim-amino: go.sum
+	mkdir -p $(BUILDDIR)
+	go build -mod=readonly $(BUILD_FLAGS) -tags test_amino -o $(BUILDDIR) ./simapp/cmd/simd
+	go build -mod=readonly $(BUILD_FLAGS) -tags test_amino -o $(BUILDDIR) ./simapp/cmd/simcli
+
 .PHONY: \
  build \
  build-sim
@@ -131,6 +136,9 @@ test-race:
 test-integration: build-sim
 	BUILDDIR=$(BUILDDIR) go test -mod=readonly -p 4 -tags='ledger test_ledger_mock cli_test' -run ^TestCLI `go list ./.../cli/...`
 
+test-integration-amino: build-sim-amino
+	BUILDDIR=$(BUILDDIR) go test -mod=readonly -p 4 -tags='ledger test_ledger_mock cli_test test_amino' -run ^TestCLI `go list ./.../cli/...`
+
 .PHONY: test test-all test-ledger-mock test-ledger test-unit test-race
 
 test-sim-nondeterminism:

baseapp/abci.go

@@ -376,12 +376,7 @@ func handleQueryApp(app *BaseApp, path []string, req abci.RequestQuery) abci.Res
 		case "simulate":
 			txBytes := req.Data
 
-			tx, err := app.txDecoder(txBytes)
-			if err != nil {
-				return sdkerrors.QueryResult(sdkerrors.Wrap(err, "failed to decode tx"))
-			}
-
-			gInfo, res, err := app.Simulate(txBytes, tx)
+			gInfo, res, _, err := app.Simulate(txBytes)
 			if err != nil {
 				return sdkerrors.QueryResult(sdkerrors.Wrap(err, "failed to simulate tx"))
 			}

baseapp/baseapp_test.go

@@ -985,13 +985,13 @@ func TestSimulateTx(t *testing.T) {
 		require.Nil(t, err)
 
 		// simulate a message, check gas reported
-		gInfo, result, err := app.Simulate(txBytes, tx)
+		gInfo, result, _, err := app.Simulate(txBytes)
 		require.NoError(t, err)
 		require.NotNil(t, result)
 		require.Equal(t, gasConsumed, gInfo.GasUsed)
 
 		// simulate again, same result
-		gInfo, result, err = app.Simulate(txBytes, tx)
+		gInfo, result, _, err = app.Simulate(txBytes)
 		require.NoError(t, err)
 		require.NotNil(t, result)
 		require.Equal(t, gasConsumed, gInfo.GasUsed)

baseapp/helpers.go

@@ -3,15 +3,22 @@ package baseapp
 import (
 	abci "github.com/tendermint/tendermint/abci/types"
 
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 func (app *BaseApp) Check(tx sdk.Tx) (sdk.GasInfo, *sdk.Result, error) {
 	return app.runTx(runTxModeCheck, nil, tx)
 }
 
-func (app *BaseApp) Simulate(txBytes []byte, tx sdk.Tx) (sdk.GasInfo, *sdk.Result, error) {
-	return app.runTx(runTxModeSimulate, txBytes, tx)
+func (app *BaseApp) Simulate(txBytes []byte) (sdk.GasInfo, *sdk.Result, sdk.Tx, error) {
+	tx, err := app.txDecoder(txBytes)
+	if err != nil {
+		return sdk.GasInfo{}, nil, nil, sdkerrors.Wrap(err, "failed to decode tx")
+	}
+	gi, r, err := app.runTx(runTxModeSimulate, txBytes, tx)
+	return gi, r, tx, err
 }
 
 func (app *BaseApp) Deliver(tx sdk.Tx) (sdk.GasInfo, *sdk.Result, error) {

client/broadcast.go

@@ -16,7 +16,7 @@ import (
 // based on the context parameters. The result of the broadcast is parsed into
 // an intermediate structure which is logged if the context has a logger
 // defined.
-func (ctx Context) BroadcastTx(txBytes []byte) (res sdk.TxResponse, err error) {
+func (ctx Context) BroadcastTx(txBytes []byte) (res *sdk.TxResponse, err error) {
 	switch ctx.BroadcastMode {
 	case flags.BroadcastSync:
 		res, err = ctx.BroadcastTxSync(txBytes)
@@ -28,7 +28,7 @@ func (ctx Context) BroadcastTx(txBytes []byte) (res sdk.TxResponse, err error) {
 		res, err = ctx.BroadcastTxCommit(txBytes)
 
 	default:
-		return sdk.TxResponse{}, fmt.Errorf("unsupported return type %s; supported types: sync, async, block", ctx.BroadcastMode)
+		return nil, fmt.Errorf("unsupported return type %s; supported types: sync, async, block", ctx.BroadcastMode)
 	}
 
 	return res, err
@@ -84,16 +84,16 @@ func CheckTendermintError(err error, txBytes []byte) *sdk.TxResponse {
 // NOTE: This should ideally not be used as the request may timeout but the tx
 // may still be included in a block. Use BroadcastTxAsync or BroadcastTxSync
 // instead.
-func (ctx Context) BroadcastTxCommit(txBytes []byte) (sdk.TxResponse, error) {
+func (ctx Context) BroadcastTxCommit(txBytes []byte) (*sdk.TxResponse, error) {
 	node, err := ctx.GetNode()
 	if err != nil {
-		return sdk.TxResponse{}, err
+		return nil, err
 	}
 
 	res, err := node.BroadcastTxCommit(txBytes)
 	if err != nil {
 		if errRes := CheckTendermintError(err, txBytes); errRes != nil {
-			return *errRes, nil
+			return errRes, nil
 		}
 
 		return sdk.NewResponseFormatBroadcastTxCommit(res), err
@@ -112,31 +112,31 @@ func (ctx Context) BroadcastTxCommit(txBytes []byte) (sdk.TxResponse, error) {
 
 // BroadcastTxSync broadcasts transaction bytes to a Tendermint node
 // synchronously (i.e. returns after CheckTx execution).
-func (ctx Context) BroadcastTxSync(txBytes []byte) (sdk.TxResponse, error) {
+func (ctx Context) BroadcastTxSync(txBytes []byte) (*sdk.TxResponse, error) {
 	node, err := ctx.GetNode()
 	if err != nil {
-		return sdk.TxResponse{}, err
+		return nil, err
 	}
 
 	res, err := node.BroadcastTxSync(txBytes)
 	if errRes := CheckTendermintError(err, txBytes); errRes != nil {
-		return *errRes, nil
+		return errRes, nil
 	}
 
 	return sdk.NewResponseFormatBroadcastTx(res), err
 }
 
 // BroadcastTxAsync broadcasts transaction bytes to a Tendermint node
 // asynchronously (i.e. returns immediately).
-func (ctx Context) BroadcastTxAsync(txBytes []byte) (sdk.TxResponse, error) {
+func (ctx Context) BroadcastTxAsync(txBytes []byte) (*sdk.TxResponse, error) {
 	node, err := ctx.GetNode()
 	if err != nil {
-		return sdk.TxResponse{}, err
+		return nil, err
 	}
 
 	res, err := node.BroadcastTxAsync(txBytes)
 	if errRes := CheckTendermintError(err, txBytes); errRes != nil {
-		return *errRes, nil
+		return errRes, nil
 	}
 
 	return sdk.NewResponseFormatBroadcastTx(res), err

client/flags/flags.go

@@ -70,6 +70,7 @@ const (
 	FlagPage               = "page"
 	FlagLimit              = "limit"
 	FlagUnsafeCORS         = "unsafe-cors"
+	FlagSignMode           = "sign-mode"
 )
 
 // LineBreak can be included in a command list to provide a blank line
@@ -122,6 +123,7 @@ func PostCommands(cmds ...*cobra.Command) []*cobra.Command {
 		c.Flags().Bool(FlagOffline, false, "Offline mode (does not allow any online functionality")
 		c.Flags().BoolP(FlagSkipConfirmation, "y", false, "Skip tx broadcasting prompt confirmation")
 		c.Flags().String(FlagKeyringBackend, DefaultKeyringBackend, "Select keyring's backend (os|file|kwallet|pass|test)")
+		c.Flags().String(FlagSignMode, "", "Choose sign mode (direct|amino-json), this is an advanced feature")
 
 		// --gas can accept integers and "simulate"
 		c.Flags().Var(&GasFlagVar, "gas", fmt.Sprintf(

client/rpc/block.go

@@ -5,6 +5,8 @@ import (
 	"net/http"
 	"strconv"
 
+	"github.com/cosmos/cosmos-sdk/codec"
+
 	"github.com/gorilla/mux"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -65,10 +67,10 @@ func getBlock(clientCtx client.Context, height *int64) ([]byte, error) {
 	}
 
 	if clientCtx.Indent {
-		return legacy.Cdc.MarshalJSONIndent(res, "", "  ")
+		return legacy.MarshalJSONIndent(clientCtx.JSONMarshaler, res)
 	}
 
-	return legacy.Cdc.MarshalJSON(res)
+	return clientCtx.JSONMarshaler.MarshalJSON(res)
 }
 
 // get the current blockchain height

client/rpc/status.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"net/http"
 
+	"github.com/cosmos/cosmos-sdk/codec/legacy_global"
+
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"