Merge branch 'main' into foundation_updateparams

CHANGELOG.md

@@ -83,6 +83,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (x/modules) [\#722](https://github.com/line/lbm-sdk/pull/722) Check error for `RegisterQueryHandlerClient` in all modules `RegisterGRPCGatewayRoutes`
 * (x/bank) [\#716](https://github.com/line/lbm-sdk/pull/716) remove useless DenomMetadata key function
 * (x/foundation) [\#704](https://github.com/line/lbm-sdk/pull/704) update x/foundation params
+* (x/wasm)  [\#695](https://github.com/line/lbm-sdk/pull/695) fix to prevent external filesystem dependency of simulation
 * (x/foundation) [\#729](https://github.com/line/lbm-sdk/pull/729) add UpdateParams to x/foundation
 
 ### Bug Fixes
@@ -104,6 +105,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (global) [\#694](https://github.com/line/lbm-sdk/pull/694) replace deprecated functions since go 1.16 or 1.17
 * (x/bankplus) [\#705](https://github.com/line/lbm-sdk/pull/705) add missing blockedAddr checking in bankplus
 * (x/foundation) [\#712](https://github.com/line/lbm-sdk/pull/712) fix x/foundation EndBlocker
+* (baseapp) [\#724](https://github.com/line/lbm-sdk/pull/724) add checking pubkey type from validator params
 * (x/staking) [\#726](https://github.com/line/lbm-sdk/pull/726) check allowedList size in StakeAuthorization.Accept()
 
 ### Breaking Changes

baseapp/params.go

@@ -6,6 +6,7 @@ import (
 
 	abci "github.com/line/ostracon/abci/types"
 	ocproto "github.com/line/ostracon/proto/ostracon/types"
+	octypes "github.com/line/ostracon/types"
 
 	sdk "github.com/line/lbm-sdk/types"
 )
@@ -82,5 +83,14 @@ func ValidateValidatorParams(i interface{}) error {
 		return errors.New("validator allowed pubkey types must not be empty")
 	}
 
+	for _, pubKeyType := range v.PubKeyTypes {
+		switch pubKeyType {
+		case octypes.ABCIPubKeyTypeBls12WithEd25519, octypes.ABCIPubKeyTypeEd25519, octypes.ABCIPubKeyTypeSecp256k1, octypes.ABCIPubKeyTypeBls12:
+			continue
+		default:
+			return fmt.Errorf("not-allowed pubkey type: %s", pubKeyType)
+		}
+	}
+
 	return nil
 }

baseapp/params_test.go

@@ -58,6 +58,7 @@ func TestValidateValidatorParams(t *testing.T) {
 		{ocproto.ValidatorParams{}, true},
 		{ocproto.ValidatorParams{PubKeyTypes: []string{}}, true},
 		{ocproto.ValidatorParams{PubKeyTypes: []string{"secp256k1"}}, false},
+		{ocproto.ValidatorParams{PubKeyTypes: []string{"invalidPubKeyType"}}, true},
 	}
 
 	for _, tc := range testCases {

x/wasm/keeper/testdata/reflect.go

@@ -0,0 +1,12 @@
+package testdata
+
+import (
+	_ "embed"
+)
+
+//go:embed reflect.wasm
+var reflectContract []byte
+
+func ReflectContractWasm() []byte {
+	return reflectContract
+}

x/wasm/simulation/operations.go

@@ -2,14 +2,14 @@ package simulation
 
 import (
 	"math/rand"
-	"os"
 
 	"github.com/line/lbm-sdk/baseapp"
 	simappparams "github.com/line/lbm-sdk/simapp/params"
 	sdk "github.com/line/lbm-sdk/types"
 	"github.com/line/lbm-sdk/types/module"
 	simtypes "github.com/line/lbm-sdk/types/simulation"
 	"github.com/line/lbm-sdk/x/simulation"
+	"github.com/line/lbm-sdk/x/wasm/keeper/testdata"
 	"github.com/line/lbm-sdk/x/wasm/types"
 )
 
@@ -37,7 +37,6 @@ func WeightedOperations(
 	var (
 		weightMsgStoreCode           int
 		weightMsgInstantiateContract int
-		wasmContractPath             string
 	)
 
 	simstate.AppParams.GetOrGenerate(simstate.Cdc, OpWeightMsgStoreCode, &weightMsgStoreCode, nil,
@@ -51,17 +50,8 @@ func WeightedOperations(
 			weightMsgInstantiateContract = simappparams.DefaultWeightMsgInstantiateContract
 		},
 	)
-	simstate.AppParams.GetOrGenerate(simstate.Cdc, OpReflectContractPath, &wasmContractPath, nil,
-		func(_ *rand.Rand) {
-			// simulations are run from the `app` folder
-			wasmContractPath = "../x/wasm/keeper/testdata/reflect.wasm"
-		},
-	)
 
-	wasmBz, err := os.ReadFile(wasmContractPath)
-	if err != nil {
-		panic(err)
-	}
+	wasmBz := testdata.ReflectContractWasm()
 
 	return simulation.WeightedOperations{
 		simulation.NewWeightedOperation(

x/wasm/simulation/operations_test.go

@@ -0,0 +1,73 @@
+package simulation
+
+import (
+	"reflect"
+	"testing"
+
+	simappparams "github.com/line/lbm-sdk/simapp/params"
+	"github.com/stretchr/testify/require"
+
+	"github.com/line/lbm-sdk/types/module"
+	"github.com/line/lbm-sdk/x/simulation"
+	"github.com/line/lbm-sdk/x/wasm/keeper"
+	"github.com/line/lbm-sdk/x/wasm/types"
+)
+
+func TestWeightedOperations(t *testing.T) {
+	type args struct {
+		simstate   *module.SimulationState
+		ak         types.AccountKeeper
+		bk         simulation.BankKeeper
+		wasmKeeper WasmKeeper
+		wasmBz     []byte
+	}
+
+	params := args{
+		simstate:   &module.SimulationState{},
+		wasmKeeper: makeKeeper(t).WasmKeeper,
+	}
+
+	tests := []struct {
+		name string
+		args args
+		want simulation.WeightedOperations
+	}{
+		{
+			name: "execute success",
+			args: args{
+				simstate: &module.SimulationState{},
+			},
+			want: simulation.WeightedOperations{
+				simulation.NewWeightedOperation(
+					simappparams.DefaultWeightMsgStoreCode,
+					SimulateMsgStoreCode(params.ak, params.bk, params.wasmKeeper, params.wasmBz)),
+				simulation.NewWeightedOperation(
+					simappparams.DefaultWeightMsgInstantiateContract,
+					SimulateMsgInstantiateContract(params.ak, params.bk, params.wasmKeeper)),
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := WeightedOperations(tt.args.simstate, tt.args.ak, tt.args.bk, tt.args.wasmKeeper)
+			for i := range got {
+				require.Equal(t, tt.want[i].Weight(), got[i].Weight(), "WeightedOperations().Weight()")
+
+				expected := reflect.TypeOf(tt.want[i].Op()).String()
+				actual := reflect.TypeOf(got[i].Op()).String()
+
+				require.Equal(t, expected, actual, "return value type should be the same")
+			}
+		})
+	}
+}
+
+// Copy from keeper_test.go
+const SupportedFeatures = "iterator,staking,stargate"
+
+// Copy from keeper_test.go
+func makeKeeper(t *testing.T) keeper.TestKeepers {
+	_, keepers := keeper.CreateTestInput(t, false, SupportedFeatures, nil, nil)
+	return keepers
+}