test: enable sim test, race test

.github/workflows/sims.yml

@@ -1,15 +1,11 @@
 name: Sims
 # Sims workflow runs multiple types of simulations (nondeterminism, import-export, after-import, multi-seed-short)
 # This workflow will run on all Pull Requests, if a .go, .mod or .sum file have been changed
-env:
-  GOPRIVATE: "github.com/line/*"
-
-# TODO ebony: fix sim test failure
 on:
-#  pull_request:
-#  push:
-#    branches:
-#      - main
+  pull_request:
+  push:
+    branches:
+      - main
 
 jobs:
   cleanup-runs:
@@ -62,6 +58,7 @@ jobs:
         with:
           PATTERNS: |
             **/**.go
+            !**/**_test.go
             go.mod
             go.sum
       - uses: actions/[email protected]
@@ -86,8 +83,9 @@ jobs:
         run: go version
       - uses: technote-space/[email protected]
         with:
-          SUFFIX_FILTER: |
+          PATTERNS: |
             **/**.go
+            !**/**_test.go
             go.mod
             go.sum
           SET_ENV_NAME_INSERTIONS: 1
@@ -114,8 +112,9 @@ jobs:
         run: go version
       - uses: technote-space/[email protected]
         with:
-          SUFFIX_FILTER: |
+          PATTERNS: |
             **/**.go
+            !**/**_test.go
             go.mod
             go.sum
           SET_ENV_NAME_INSERTIONS: 1
@@ -142,8 +141,9 @@ jobs:
         run: go version
       - uses: technote-space/[email protected]
         with:
-          SUFFIX_FILTER: |
+          PATTERNS: |
             **/**.go
+            !**/**_test.go
             go.mod
             go.sum
           SET_ENV_NAME_INSERTIONS: 1

.github/workflows/test.yml

@@ -65,28 +65,28 @@ jobs:
       - name: Build
         run: GOOS=linux CGO_ENABLED=1 GOARCH=${{ matrix.goarch }} CC=${{ matrix.gcc }} LEDGER_ENABLED=false make build
 
-  # TODO: disable test-race. please enable this after fixing concurrent checkTx
-  # test-cosmovisor:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - uses: actions/[email protected]
-  #       with:
-  #         go-version: 1.15
-  #     - name: Display go version
-  #       run: go version
-  #     - uses: technote-space/[email protected]
-  #       id: git_diff
-  #       with:
-  #         PREFIX_FILTER: |
-  #           cosmovisor
-  #         PATTERNS: |
-  #           **/**.go
-  #           go.mod
-  #           go.sum
-  #     - name: Run cosmovisor tests
-  #       run: cd cosmovisor; make
-  #       if: env.GIT_DIFF
+# TODO: disable test-cosmovisor; this test uses uploaded binary(cosmos-sdk)
+#  test-cosmovisor:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v2
+#      - uses: actions/[email protected]
+#        with:
+#          go-version: 1.15
+#      - name: Display go version
+#        run: go version
+#      - uses: technote-space/[email protected]
+#        id: git_diff
+#        with:
+#          PREFIX_FILTER: |
+#            cosmovisor
+#          PATTERNS: |
+#            **/**.go
+#            go.mod
+#            go.sum
+#      - name: Run cosmovisor tests
+#        run: cd cosmovisor; make
+#        if: env.GIT_DIFF
 
   split-test-files:
     runs-on: ubuntu-latest

baseapp/baseapp.go

@@ -361,7 +361,7 @@ func (app *BaseApp) setCheckState(header ocproto.Header) {
 
 	app.checkState = &state{
 		ms:  ms,
-		ctx: ctx.WithConsensusParams(app.GetConsensusParams(ctx)),
+		ctx: ctx,
 	}
 }
 

docs/core/proto-docs.md

@@ -2070,7 +2070,7 @@ source tracing information path.
 ### FungibleTokenPacketData
 FungibleTokenPacketData defines a struct for the packet payload
 See FungibleTokenPacketData spec:
-https://github.com/cosmos/ics/tree/master/spec/ics-020-fungible-token-transfer#data-structures
+https://github.com/cosmos/ibc/tree/master/spec/app/ics-020-fungible-token-transfer#data-structures
 
 
 | Field | Type | Label | Description |
@@ -2401,7 +2401,7 @@ Params defines the set of IBC light client parameters.
 ### MsgTransfer
 MsgTransfer defines a msg to transfer fungible tokens (i.e Coins) between
 ICS20 enabled chains. See ICS Spec here:
-https://github.com/cosmos/ics/tree/master/spec/ics-020-fungible-token-transfer#data-structures
+https://github.com/cosmos/ics/tree/master/spec/app/ics-020-fungible-token-transfer#data-structures
 
 
 | Field | Type | Label | Description |
@@ -2464,7 +2464,7 @@ NOTE: The field numbers 21 and 22 were explicitly chosen to avoid accidental
 conflicts with other protobuf message formats used for acknowledgements.
 The first byte of any message with this format will be the non-ASCII values
 `0xaa` (result) or `0xb2` (error). Implemented as defined by ICS:
-https://github.com/cosmos/ics/tree/master/spec/ics-004-channel-and-packet-semantics#acknowledgement-envelope
+https://github.com/cosmos/ibc/tree/master/spec/core/ics-004-channel-and-packet-semantics#acknowledgement-envelope
 
 
 | Field | Type | Label | Description |

x/auth/simulation/genesis.go

@@ -89,7 +89,8 @@ func GenSigVerifyCostSECP256K1(r *rand.Rand) uint64 {
 }
 
 func GenValidSigBlockPeriod(r *rand.Rand) uint64 {
-	return uint64(simulation.RandIntBetween(r, 1, 1000))
+	// We use valid sig block period greater than 100 for testing
+	return uint64(simulation.RandIntBetween(r, 100, 1000))
 }
 
 // RandomizedGenState generates a random GenesisState for auth

x/auth/types/account.go

@@ -31,6 +31,10 @@ var (
 
 	BaseAccountSig   = []byte("bacc")
 	ModuleAccountSig = []byte("macc")
+
+	PubKeyTypeSecp256k1 = byte(1)
+	PubKeyTypeEd25519   = byte(2)
+	PubKeyTypeMultisig  = byte(3)
 )
 
 // NewBaseAccount creates a new BaseAccount object
@@ -407,10 +411,14 @@ type GenesisAccount interface {
 
 // custom json marshaler for BaseAccount & ModuleAccount
 
+type PubKeyJSON struct {
+	Type byte   `json:"type"`
+	Key  []byte `json:"key"`
+}
 type BaseAccountJSON struct {
-	Address  string          `json:"address"`
-	PubKey   json.RawMessage `json:"pub_key"`
-	Sequence string          `json:"sequence"`
+	Address  string     `json:"address"`
+	PubKey   PubKeyJSON `json:"pub_key"`
+	Sequence string     `json:"sequence"`
 }
 
 func (acc BaseAccount) MarshalJSONPB(m *jsonpb.Marshaler) ([]byte, error) {
@@ -420,19 +428,22 @@ func (acc BaseAccount) MarshalJSONPB(m *jsonpb.Marshaler) ([]byte, error) {
 	bi.Sequence = strconv.FormatUint(acc.Sequence, 10)
 	var bz []byte
 	var err error
-	if acc.Ed25519PubKey != nil {
-		bz, err = codec.ProtoMarshalJSON(acc.Ed25519PubKey, m.AnyResolver)
-	}
 	if acc.Secp256K1PubKey != nil {
-		bz, err = codec.ProtoMarshalJSON(acc.Secp256K1PubKey, m.AnyResolver)
+		bi.PubKey.Type = PubKeyTypeSecp256k1
+		bz, err = acc.Secp256K1PubKey.Marshal()
+	}
+	if acc.Ed25519PubKey != nil {
+		bi.PubKey.Type = PubKeyTypeEd25519
+		bz, err = acc.Ed25519PubKey.Marshal()
 	}
 	if acc.MultisigPubKey != nil {
-		bz, err = codec.ProtoMarshalJSON(acc.MultisigPubKey, m.AnyResolver)
+		bi.PubKey.Type = PubKeyTypeMultisig
+		bz, err = acc.MultisigPubKey.Marshal()
 	}
 	if err != nil {
 		return nil, err
 	}
-	bi.PubKey = bz
+	bi.PubKey.Key = bz
 	return json.Marshal(bi)
 }
 
@@ -443,42 +454,32 @@ func (acc *BaseAccount) UnmarshalJSONPB(m *jsonpb.Unmarshaler, bz []byte) error
 	if err != nil {
 		return err
 	}
-	/* TODO: do we need to validate address format here
-	err = sdk.ValidateAccAddress(bi.Address)
-	if err != nil {
-		return err
-	}
-	*/
 
 	acc.Address = bi.Address
 	acc.Sequence, err = strconv.ParseUint(bi.Sequence, 10, 64)
 	if err != nil {
 		return err
 	}
 
-	done := false
-	if !done {
+	switch bi.PubKey.Type {
+	case PubKeyTypeSecp256k1:
 		pk := new(secp256k1.PubKey)
-		any, _ := codectypes.NewAnyWithValue(pk)
-		if m.Unmarshal(strings.NewReader(string(bi.PubKey)), any) == nil {
-			acc.SetPubKey(pk)
-			done = true
+		if err := pk.Unmarshal(bi.PubKey.Key); err != nil {
+			return err
 		}
-	}
-	if !done {
-		pk := new(ed25519.PubKey)
-		any, _ := codectypes.NewAnyWithValue(pk)
-		if m.Unmarshal(strings.NewReader(string(bi.PubKey)), any) == nil {
-			acc.SetPubKey(pk)
-			done = true
+		acc.SetPubKey(pk)
+	case PubKeyTypeEd25519:
+		pk := new(secp256k1.PubKey)
+		if err := pk.Unmarshal(bi.PubKey.Key); err != nil {
+			return err
 		}
-	}
-	if !done {
+		acc.SetPubKey(pk)
+	case PubKeyTypeMultisig:
 		pk := new(multisig.LegacyAminoPubKey)
-		any, _ := codectypes.NewAnyWithValue(pk)
-		if m.Unmarshal(strings.NewReader(string(bi.PubKey)), any) == nil {
-			acc.SetPubKey(pk)
+		if err := pk.Unmarshal(bi.PubKey.Key); err != nil {
+			return err
 		}
+		acc.SetPubKey(pk)
 	}
 	return nil
 }

x/auth/types/account_test.go

@@ -6,6 +6,8 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/line/lbm-sdk/codec"
+	types2 "github.com/line/lbm-sdk/codec/types"
 	"github.com/stretchr/testify/require"
 	yaml "gopkg.in/yaml.v2"
 
@@ -48,6 +50,21 @@ func TestBaseAddressPubKey(t *testing.T) {
 	require.EqualValues(t, addr2, acc2.GetAddress())
 }
 
+func TestBaseAccountMarshalUnmarshalJSON(t *testing.T) {
+	interfaceRegistry := types2.NewInterfaceRegistry()
+
+	cdc := codec.NewProtoCodec(interfaceRegistry)
+	_, pub, addr := testdata.KeyTestPubAddr()
+	acc := types.NewBaseAccountWithAddress(addr)
+	acc.SetPubKey(pub)
+
+	bz := cdc.MustMarshalJSON(acc)
+	var acc2 types.BaseAccount
+
+	cdc.MustUnmarshalJSON(bz, &acc2)
+	require.Equal(t, acc, &acc2)
+}
+
 func TestBaseSequence(t *testing.T) {
 	_, _, addr := testdata.KeyTestPubAddr()
 	acc := types.NewBaseAccountWithAddress(addr)