use sequence

x/opchild/keeper/keeper.go

@@ -36,7 +36,7 @@ type Keeper struct {
 	consensusAddressCodec address.Codec
 
 	Schema               collections.Schema
-	NextL2Sequence       collections.Item[uint64]
+	NextL2Sequence       collections.Sequence
 	Params               collections.Item[types.Params]
 	FinalizedL1Sequence  collections.Map[uint64, bool]
 	LastValidatorPowers  collections.Map[[]byte, int64]
@@ -78,7 +78,7 @@ func NewKeeper(
 		authority:             authority,
 		validatorAddressCodec: validatorAddressCodec,
 		consensusAddressCodec: consensusAddressCodec,
-		NextL2Sequence:        collections.NewItem(sb, types.NextL2SequenceKey, "next_l2_sequence", collections.Uint64Value),
+		NextL2Sequence:        collections.NewSequence(sb, types.NextL2SequenceKey, "next_l2_sequence"),
 		Params:                collections.NewItem(sb, types.ParamsKey, "params", codec.CollValue[types.Params](cdc)),
 		FinalizedL1Sequence:   collections.NewMap(sb, types.FinalizedL1SequencePrefix, "finalized_l1_sequence", collections.Uint64Key, collections.BoolValue),
 		LastValidatorPowers:   collections.NewMap(sb, types.LastValidatorPowerPrefix, "last_validator_powers", collections.BytesKey, collections.Int64Value),

x/opchild/keeper/sequences.go

@@ -2,9 +2,9 @@ package keeper
 
 import (
 	"context"
-	"errors"
 
 	"cosmossdk.io/collections"
+	"github.com/initia-labs/OPinit/x/opchild/types"
 )
 
 func (k Keeper) RecordFinalizedL1Sequence(ctx context.Context, l1Sequence uint64) error {
@@ -26,27 +26,30 @@ func (k Keeper) SetNextL2Sequence(ctx context.Context, l2Sequence uint64) error
 }
 
 func (k Keeper) GetNextL2Sequence(ctx context.Context) (uint64, error) {
-	nextL2Sequence, err := k.NextL2Sequence.Get(ctx)
+	nextL2Sequence, err := k.NextL2Sequence.Peek(ctx)
 	if err != nil {
-		if errors.Is(err, collections.ErrNotFound) {
-			return 1, nil
-		}
-
 		return 0, err
 	}
 
+	if nextL2Sequence == collections.DefaultSequenceStart {
+		return types.DefaultL2SequenceStart, nil
+	}
+
 	return nextL2Sequence, nil
 }
 
 func (k Keeper) IncreaseNextL2Sequence(ctx context.Context) (uint64, error) {
-	nextL2Sequence, err := k.GetNextL2Sequence(ctx)
+	nextL2Sequence, err := k.NextL2Sequence.Next(ctx)
 	if err != nil {
 		return 0, err
 	}
 
-	// increase NextL2Sequence
-	if err = k.NextL2Sequence.Set(ctx, nextL2Sequence+1); err != nil {
-		return 0, err
+	if nextL2Sequence == collections.DefaultSequenceStart {
+		if err := k.NextL2Sequence.Set(ctx, types.DefaultL2SequenceStart+1); err != nil {
+			return 0, err
+		}
+
+		return types.DefaultL2SequenceStart, nil
 	}
 
 	return nextL2Sequence, nil

x/opchild/types/genesis.go

@@ -9,6 +9,8 @@ import (
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 )
 
+const DefaultL2SequenceStart = 1
+
 // NewGenesisState creates a new GenesisState instance
 func NewGenesisState(params Params, validators []Validator) *GenesisState {
 	return &GenesisState{
@@ -26,7 +28,7 @@ func DefaultGenesisState() *GenesisState {
 		LastValidatorPowers:  []LastValidatorPower{},
 		Validators:           []Validator{},
 		Exported:             false,
-		NextL2Sequence:       1,
+		NextL2Sequence:       DefaultL2SequenceStart,
 		FinalizedL1Sequences: []uint64{},
 	}
 }
@@ -38,6 +40,10 @@ func ValidateGenesis(data *GenesisState, ac address.Codec) error {
 		return err
 	}
 
+	if data.NextL2Sequence < DefaultL2SequenceStart {
+		return ErrInvalidSequence
+	}
+
 	return data.Params.Validate(ac)
 }
 

x/ophost/keeper/bridge.go

@@ -45,7 +45,7 @@ func (k Keeper) GetNextL1Sequence(ctx context.Context, bridgeId uint64) (uint64,
 	nextSequence, err := k.NextL1Sequences.Get(ctx, bridgeId)
 	if err != nil {
 		if errors.Is(err, collections.ErrNotFound) {
-			nextSequence = 1
+			nextSequence = types.DefaultL1SequenceStart
 		} else {
 			return 0, err
 		}
@@ -76,27 +76,30 @@ func (k Keeper) SetNextBridgeId(ctx context.Context, nextBridgeId uint64) error
 }
 
 func (k Keeper) GetNextBridgeId(ctx context.Context) (uint64, error) {
-	nextBridgeId, err := k.NextBridgeId.Get(ctx)
+	nextBridgeId, err := k.NextBridgeId.Peek(ctx)
 	if err != nil {
-		if errors.Is(err, collections.ErrNotFound) {
-			nextBridgeId = 1
-		} else {
-			return 0, err
-		}
+		return 0, err
+	}
+
+	if nextBridgeId == collections.DefaultSequenceStart {
+		return types.DefaultBridgeIdStart, nil
 	}
 
 	return nextBridgeId, nil
 }
 
 func (k Keeper) IncreaseNextBridgeId(ctx context.Context) (uint64, error) {
-	nextBridgeId, err := k.GetNextBridgeId(ctx)
+	nextBridgeId, err := k.NextBridgeId.Next(ctx)
 	if err != nil {
 		return 0, err
 	}
 
-	// increase NextBridgeId
-	if err := k.NextBridgeId.Set(ctx, nextBridgeId+1); err != nil {
-		return 0, err
+	if nextBridgeId == collections.DefaultSequenceStart {
+		if err := k.NextBridgeId.Set(ctx, types.DefaultBridgeIdStart+1); err != nil {
+			return 0, err
+		}
+
+		return types.DefaultBridgeIdStart, nil
 	}
 
 	return nextBridgeId, nil

x/ophost/keeper/keeper.go

@@ -26,7 +26,7 @@ type Keeper struct {
 	authority string
 
 	Schema            collections.Schema
-	NextBridgeId      collections.Item[uint64]
+	NextBridgeId      collections.Sequence
 	Params            collections.Item[types.Params]
 	BridgeConfigs     collections.Map[uint64, types.BridgeConfig]
 	NextL1Sequences   collections.Map[uint64, uint64]
@@ -58,7 +58,7 @@ func NewKeeper(
 		bankKeeper:        bk,
 		bridgeHook:        bridgeHook,
 		authority:         authority,
-		NextBridgeId:      collections.NewItem(sb, types.NextBridgeIdKey, "next_bridge_id", collections.Uint64Value),
+		NextBridgeId:      collections.NewSequence(sb, types.NextBridgeIdKey, "next_bridge_id"),
 		Params:            collections.NewItem(sb, types.ParamsKey, "params", codec.CollValue[types.Params](cdc)),
 		BridgeConfigs:     collections.NewMap(sb, types.BridgeConfigPrefix, "bridge_configs", collections.Uint64Key, codec.CollValue[types.BridgeConfig](cdc)),
 		NextL1Sequences:   collections.NewMap(sb, types.NextL1SequencePrefix, "next_l1_sequences", collections.Uint64Key, collections.Uint64Value),

x/ophost/types/genesis.go

@@ -5,6 +5,11 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
+const (
+	DefaultBridgeIdStart   = 1
+	DefaultL1SequenceStart = 1
+)
+
 // NewGenesisState creates a new GenesisState instance
 func NewGenesisState(params Params, bridges []Bridge, nextBridgeId uint64) *GenesisState {
 	return &GenesisState{
@@ -19,7 +24,7 @@ func DefaultGenesisState() *GenesisState {
 	return &GenesisState{
 		Params:       DefaultParams(),
 		Bridges:      []Bridge{},
-		NextBridgeId: 1,
+		NextBridgeId: DefaultBridgeIdStart,
 	}
 }
 
@@ -35,7 +40,7 @@ func ValidateGenesis(data *GenesisState, ac address.Codec) error {
 			return ErrInvalidBridgeId
 		}
 
-		if bridge.NextL1Sequence == 0 {
+		if bridge.NextL1Sequence < DefaultL1SequenceStart {
 			return ErrInvalidSequence
 		}
 
@@ -65,7 +70,7 @@ func ValidateGenesis(data *GenesisState, ac address.Codec) error {
 		}
 	}
 
-	if data.NextBridgeId == 0 {
+	if data.NextBridgeId < DefaultBridgeIdStart {
 		return ErrInvalidBridgeId
 	}