Skip to content

chore: small code cleanup #324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
julienrbrt merged 5 commits into from
Dec 17, 2025
Merged

chore: small code cleanup #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
daf9db7
chore: small attester code cleanups
julienrbrt Dec 17, 2025
29c1cff
cleanup
julienrbrt Dec 17, 2025
b9a483f
bump ignite app
julienrbrt Dec 17, 2025
d86c645
updates
julienrbrt Dec 17, 2025
fbe0683
cleanup
julienrbrt Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions .github/workflows/integration_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
image_tag: ${{ steps.tag.outputs.tag }}
env:
IGNITE_VERSION: v29.3.0 # the gm build script depends on some annotations
IGNITE_EVOLVE_APP_VERSION: "d02e4975a7030d0cd4a15680d534ee51b1952950" # use tagged when apps has tagged (blocked on things)
IGNITE_EVOLVE_APP_VERSION: main
EVNODE_VERSION: v1.0.0-beta.10.0.20251216132820-afcd6bd9b354
steps:
- uses: actions/checkout@v5
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
env:
EVNODE_VERSION: "v1.0.0-beta.10.0.20251216132820-afcd6bd9b354"
IGNITE_VERSION: "v29.6.1"
IGNITE_EVOLVE_APP_VERSION: "d02e4975a7030d0cd4a15680d534ee51b1952950" # use tagged when apps has tagged (blocked on things)
IGNITE_EVOLVE_APP_VERSION: "main"
EVOLVE_IMAGE_REPO: "evolve-gm"
EVOLVE_IMAGE_TAG: "latest"

Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
DO_NOT_TRACK: true
EVNODE_VERSION: "v1.0.0-beta.10.0.20251216132820-afcd6bd9b354"
IGNITE_VERSION: "v29.6.1"
IGNITE_EVOLVE_APP_VERSION: "d02e4975a7030d0cd4a15680d534ee51b1952950" # use tagged when apps has tagged (blocked on things)
IGNITE_EVOLVE_APP_VERSION: "main"
outputs:
carol_mnemonic: ${{ steps.save_mnemonic.outputs.carol_mnemonic }}
gmd_home: ${{ steps.paths.outputs.GMD_HOME }}
Expand Down Expand Up @@ -161,7 +161,6 @@ jobs:

# replace the github.com/evstack/ev-node module with tagged version
go mod edit -replace github.com/evstack/ev-node=github.com/evstack/ev-node@$EVNODE_VERSION
go mod edit -replace github.com/evstack/ev-node/core=github.com/evstack/ev-node/core@v1.0.0-beta.5.0.20251216132820-afcd6bd9b354 # TODO REMOVE AFTER TAG

# replace the github.com/evstack/ev-abci module with the local version
go mod edit -replace github.com/evstack/ev-abci=$GO_EXECUTION_ABCI_DIR
Expand Down Expand Up @@ -361,7 +360,6 @@ jobs:
cd /tmp/da-tool
go mod init temp
go mod edit -replace github.com/evstack/ev-node=github.com/evstack/ev-node@$EVNODE_VERSION
go mod edit -replace github.com/evstack/ev-node/core=github.com/evstack/ev-node/core@v1.0.0-beta.5.0.20251216132820-afcd6bd9b354 # TODO REMOVE AFTER TAG
go get github.com/evstack/ev-node/tools/local-da
# start the local da in the background
go tool github.com/evstack/ev-node/tools/local-da &
Expand Down Expand Up @@ -544,7 +542,7 @@ jobs:
DO_NOT_TRACK: true
EVNODE_VERSION: "v1.0.0-beta.10.0.20251216132820-afcd6bd9b354"
IGNITE_VERSION: "v29.6.1"
IGNITE_EVOLVE_APP_VERSION: "d02e4975a7030d0cd4a15680d534ee51b1952950" # use tagged when apps has tagged (blocked on things)
IGNITE_EVOLVE_APP_VERSION: "main"
GAIA_VERSION: "v25.1.0"
EVOLVE_IMAGE_REPO: "evabci/gm"
EVOLVE_IMAGE_TAG: "local"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/migration_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ permissions:
env:
EVNODE_VERSION: "v1.0.0-beta.10.0.20251216132820-afcd6bd9b354"
IGNITE_VERSION: "v29.6.1"
IGNITE_EVOLVE_APP_VERSION: "d02e4975a7030d0cd4a15680d534ee51b1952950" # use tagged when apps has tagged (blocked on things)
IGNITE_EVOLVE_APP_VERSION: "main"
EVOLVE_IMAGE_REPO: "ghcr.io/evstack/evolve-abci-gm"
COSMOS_SDK_IMAGE_REPO: "ghcr.io/evstack/cosmos-sdk-gm"

Expand Down
3 changes: 1 addition & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN apk add --no-cache \
# Set environment variables
ENV EVNODE_VERSION=v1.0.0-beta.10.0.20251216132820-afcd6bd9b354
ENV IGNITE_VERSION=v29.6.1
ENV IGNITE_EVOLVE_APP_VERSION=d02e4975a7030d0cd4a15680d534ee51b1952950
ENV IGNITE_EVOLVE_APP_VERSION=main

RUN curl -sSL https://get.ignite.com/cli@${IGNITE_VERSION}! | bash

Expand All @@ -27,7 +27,6 @@ RUN ignite app install github.com/ignite/apps/evolve@${IGNITE_EVOLVE_APP_VERSION
ignite evolve add-migrate

RUN go mod edit -replace github.com/evstack/ev-node=github.com/evstack/ev-node@${EVNODE_VERSION} && \
go mod edit -replace github.com/evstack/ev-node/core=github.com/evstack/ev-node/core@v1.0.0-beta.5.0.20251216132820-afcd6bd9b354 && \
go mod edit -replace github.com/evstack/ev-abci=/workspace/ev-abci && \
go mod tidy && \
go mod download
Expand Down
13 changes: 0 additions & 13 deletions Dockerfile.cosmos-sdk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,6 @@ RUN if [ "$ENABLE_IBC" = "false" ]; then \
echo "IBC enabled, leaving registration intact."; \
fi

# Pin dependency versions to avoid compatibility issues
RUN go mod edit -replace github.com/libp2p/go-libp2p-quic-transport=github.com/libp2p/go-libp2p-quic-transport@v0.33.1 && \
go mod edit -replace github.com/libp2p/go-libp2p=github.com/libp2p/go-libp2p@v0.43.0 && \
go mod edit -replace github.com/quic-go/quic-go=github.com/quic-go/quic-go@v0.54.1 && \
go mod edit -replace github.com/quic-go/webtransport-go=github.com/quic-go/webtransport-go@v0.9.0 && \
go mod edit -replace github.com/multiformats/go-multiaddr=github.com/multiformats/go-multiaddr@v0.16.1 && \
go mod edit -replace buf.build/go/protovalidate=buf.build/go/protovalidate@v0.12.0 && \
go mod tidy && \
go mod download

# Verify pinned module versions are effective in build context
RUN go list -m all | grep -E 'github.com/libp2p/go-libp2p|github.com/multiformats/go-multiaddr'

# Build the Cosmos SDK binary
RUN ignite chain build --skip-proto

Expand Down
41 changes: 3 additions & 38 deletions modules/network/keeper/abci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,6 @@ import (
"github.com/evstack/ev-abci/modules/network/types"
)

// BeginBlocker handles begin block logic for the network module
func (k Keeper) BeginBlocker(ctx sdk.Context) error {
//params := k.GetParams(ctx)

// Only process if sign mode is IBC_ONLY and we have outbound IBC packets
//if params.SignMode == types.SignMode_SIGN_MODE_IBC_ONLY {
// return errors.New("IBC only sign mode not yet implemented")
//}
return nil
}

// EndBlocker handles end block logic for the network module
func (k Keeper) EndBlocker(ctx sdk.Context) error {
height := ctx.BlockHeight()
Expand Down Expand Up @@ -123,34 +112,10 @@ func (k Keeper) processEpochEnd(ctx sdk.Context, epoch uint64) error {
}
}

//if !params.EmergencyMode {
// epochStartHeight := int64(epoch * params.EpochLength)
// checkpointsInEpoch := 0
// softConfirmedCheckpoints := 0
//
// for h := epochStartHeight; h < epochStartHeight+int64(params.EpochLength); h++ {
// if h > ctx.BlockHeight() {
// break
// }
// if k.IsCheckpointHeight(ctx, h) {
// checkpointsInEpoch++
// if q, err := k.IsSoftConfirmed(ctx, h); q && err == nil {
// softConfirmedCheckpoints++
// }
// }
// }
//
// if checkpointsInEpoch > 0 && softConfirmedCheckpoints == 0 {
// // todo (Alex): should we really fail?
// //return fmt.Errorf("no checkpoints achieved quorum in epoch: %d", epoch)
// k.Logger(ctx).Info("No checkpoints achieved quorum in epoch", "epoch", epoch)
// }
//}

// todo (Alex): find a way to prune only bitmaps that are not used anymore
//if err := k.PruneOldBitmaps(ctx, epoch); err != nil {
// return fmt.Errorf("pruning old data at epoch %d: %w", epoch, err)
//}
// if err := k.PruneOldBitmaps(ctx, epoch); err != nil {
// return fmt.Errorf("pruning old data at epoch %d: %w", epoch, err)
// }

if err := k.BuildValidatorIndexMap(ctx); err != nil {
return fmt.Errorf("rebuilding validator index map at epoch %d: %w", epoch, err)
Expand Down
26 changes: 0 additions & 26 deletions modules/network/types/params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,6 @@ import (
"fmt"

"cosmossdk.io/math"
paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
)

var (
KeyEpochLength = []byte("EpochLength")
KeyQuorumFraction = []byte("QuorumFraction")
KeyMinParticipation = []byte("MinParticipation")
KeyPruneAfter = []byte("PruneAfter")
KeyEmergencyMode = []byte("EmergencyMode")
KeySignMode = []byte("SignMode")
)

// Default parameter values
Expand Down Expand Up @@ -53,17 +43,6 @@ func DefaultParams() Params {
)
}

// ParamSetPairs implements params.ParamSet
func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs {
return paramtypes.ParamSetPairs{
paramtypes.NewParamSetPair(KeyEpochLength, &p.EpochLength, validateEpochLength),
paramtypes.NewParamSetPair(KeyQuorumFraction, &p.QuorumFraction, validateQuorumFraction),
paramtypes.NewParamSetPair(KeyMinParticipation, &p.MinParticipation, validateMinParticipation),
paramtypes.NewParamSetPair(KeyPruneAfter, &p.PruneAfter, validatePruneAfter),
paramtypes.NewParamSetPair(KeySignMode, &p.SignMode, validateSignMode),
}
}

// Validate validates the parameter set
func (p Params) Validate() error {
if err := validateEpochLength(p.EpochLength); err != nil {
Expand Down Expand Up @@ -162,8 +141,3 @@ func validateSignMode(i interface{}) error {

return nil
}

// ParamKeyTable returns the parameter key table
func ParamKeyTable() paramtypes.KeyTable {
return paramtypes.NewKeyTable().RegisterParamSet(&Params{})
}
3 changes: 1 addition & 2 deletions tests/integration/docker/Dockerfile.gm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
FROM golang:1.24-bookworm AS builder

ARG IGNITE_VERSION=v29.3.1
ARG IGNITE_EVOLVE_APP_VERSION=d02e4975a7030d0cd4a15680d534ee51b1952950
ARG IGNITE_EVOLVE_APP_VERSION=main
ARG EVNODE_VERSION=v1.0.0-beta.10.0.20251216132820-afcd6bd9b354

RUN apt-get update && apt-get install -y --no-install-recommends \
Expand Down Expand Up @@ -33,7 +33,6 @@ RUN chmod +x /workspace/patch-app-wiring.sh && \

# Align module versions like in CI
RUN go mod edit -replace github.com/evstack/ev-node=github.com/evstack/ev-node@${EVNODE_VERSION} \
&& go mod edit -replace github.com/evstack/ev-node/core=github.com/evstack/ev-node/core@v1.0.0-beta.5.0.20251216132820-afcd6bd9b354 \
&& go mod edit -replace github.com/evstack/ev-abci=../ev-abci \
&& go mod tidy

Expand Down
Loading