validate bridge config before update

initia-labs · Apr 2, 2024 · a76437e · a76437e
1 parent db30bbf
commit a76437e
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 22 deletions.
diff --git a/x/ophost/keeper/bridge.go b/x/ophost/keeper/bridge.go
@@ -17,6 +17,10 @@ func (k Keeper) SetBridgeConfig(
 	bridgeId uint64,
 	bridgeConfig types.BridgeConfig,
 ) error {
+	if err := bridgeConfig.Validate(k.authKeeper.AddressCodec()); err != nil {
+		return err
+	}
+
 	return k.BridgeConfigs.Set(ctx, bridgeId, bridgeConfig)
 }
 

diff --git a/x/ophost/keeper/genesis_test.go b/x/ophost/keeper/genesis_test.go
@@ -13,16 +13,16 @@ func Test_GenesisImportExport(t *testing.T) {
 
 	params := input.OPHostKeeper.GetParams(ctx)
 	config1 := types.BridgeConfig{
-		Challenger:          "challenger",
-		Proposer:            "proposer",
+		Challenger:          addrsStr[1],
+		Proposer:            addrsStr[0],
 		SubmissionInterval:  100,
 		FinalizationPeriod:  100,
 		SubmissionStartTime: time.Now().UTC(),
 		Metadata:            []byte{1, 2, 3},
 	}
 	config2 := types.BridgeConfig{
-		Challenger:          "challenger2",
-		Proposer:            "proposer2",
+		Challenger:          addrsStr[2],
+		Proposer:            addrsStr[3],
 		SubmissionInterval:  200,
 		FinalizationPeriod:  200,
 		SubmissionStartTime: time.Now().UTC(),

diff --git a/x/ophost/keeper/output_test.go b/x/ophost/keeper/output_test.go
@@ -79,15 +79,17 @@ func Test_IterateOutputProposal(t *testing.T) {
 func Test_IsFinalized(t *testing.T) {
 	ctx, input := createDefaultTestInput(t)
 
-	input.OPHostKeeper.SetBridgeConfig(ctx, 1, types.BridgeConfig{
-		Challenger:         "",
-		Proposer:           "",
-		SubmissionInterval: 100,
-		FinalizationPeriod: time.Second * 10,
+	err := input.OPHostKeeper.SetBridgeConfig(ctx, 1, types.BridgeConfig{
+		Challenger:          addrsStr[1],
+		Proposer:            addrsStr[0],
+		SubmissionInterval:  100,
+		FinalizationPeriod:  time.Second * 10,
+		SubmissionStartTime: time.Now().UTC(),
 	})
+	require.NoError(t, err)
 
 	proposeTime := time.Now().UTC()
-	err := input.OPHostKeeper.SetOutputProposal(ctx, 1, 1, types.Output{
+	err = input.OPHostKeeper.SetOutputProposal(ctx, 1, 1, types.Output{
 		OutputRoot:    []byte{1, 2, 3},
 		L1BlockTime:   proposeTime,
 		L2BlockNumber: 100,
@@ -134,15 +136,17 @@ func Test_NextOutputIndex(t *testing.T) {
 func Test_GetLastFinalizedOutput(t *testing.T) {
 	ctx, input := createDefaultTestInput(t)
 
-	input.OPHostKeeper.SetBridgeConfig(ctx, 1, types.BridgeConfig{
-		Challenger:         "",
-		Proposer:           "",
-		SubmissionInterval: 100,
-		FinalizationPeriod: time.Second * 10,
+	err := input.OPHostKeeper.SetBridgeConfig(ctx, 1, types.BridgeConfig{
+		Proposer:            addrsStr[0],
+		Challenger:          addrsStr[1],
+		SubmissionInterval:  100,
+		FinalizationPeriod:  time.Second * 10,
+		SubmissionStartTime: time.Now().UTC(),
 	})
+	require.NoError(t, err)
 
 	proposeTime := time.Now().UTC()
-	err := input.OPHostKeeper.SetOutputProposal(ctx, 1, 1, types.Output{
+	err = input.OPHostKeeper.SetOutputProposal(ctx, 1, 1, types.Output{
 		OutputRoot:    []byte{1, 2, 3},
 		L1BlockTime:   proposeTime,
 		L2BlockNumber: 100,

diff --git a/x/ophost/keeper/querier_test.go b/x/ophost/keeper/querier_test.go
@@ -177,15 +177,17 @@ func Test_QueryOutputProposals(t *testing.T) {
 func Test_QueryLastFinalizedOutput(t *testing.T) {
 	ctx, input := createDefaultTestInput(t)
 
-	input.OPHostKeeper.SetBridgeConfig(ctx, 1, types.BridgeConfig{
-		Challenger:         "",
-		Proposer:           "",
-		SubmissionInterval: 100,
-		FinalizationPeriod: time.Second * 10,
+	err := input.OPHostKeeper.SetBridgeConfig(ctx, 1, types.BridgeConfig{
+		Proposer:            addrsStr[0],
+		Challenger:          addrsStr[1],
+		SubmissionInterval:  100,
+		FinalizationPeriod:  time.Second * 10,
+		SubmissionStartTime: time.Now().UTC(),
 	})
+	require.NoError(t, err)
 
 	proposeTime := time.Now().UTC()
-	err := input.OPHostKeeper.SetOutputProposal(ctx, 1, 1, types.Output{
+	err = input.OPHostKeeper.SetOutputProposal(ctx, 1, 1, types.Output{
 		OutputRoot:    []byte{1, 2, 3},
 		L1BlockTime:   proposeTime,
 		L2BlockNumber: 100,