From dea520ed7efe65c09d820bda9f7fc1f9db852ac4 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Mon, 10 Nov 2025 11:40:47 +0100 Subject: [PATCH 1/4] build(deps): bump to ev-node beta 9 --- go.mod | 4 ++-- go.sum | 8 ++++---- pkg/adapter/adapter.go | 17 +---------------- pkg/adapter/convert.go | 10 +++++----- server/migration_cmd.go | 6 +----- server/migration_cmd_test.go | 4 ---- 6 files changed, 13 insertions(+), 36 deletions(-) diff --git a/go.mod b/go.mod index 1887d627..a1aabd2e 100644 --- a/go.mod +++ b/go.mod @@ -27,8 +27,8 @@ require ( github.com/cosmos/cosmos-proto v1.0.0-beta.5 github.com/cosmos/cosmos-sdk v0.50.14 github.com/cosmos/gogoproto v1.7.0 - github.com/evstack/ev-node v1.0.0-beta.8 - github.com/evstack/ev-node/core v1.0.0-beta.3 + github.com/evstack/ev-node v1.0.0-beta.9 + github.com/evstack/ev-node/core v1.0.0-beta.4 github.com/evstack/ev-node/da v1.0.0-beta.4 github.com/evstack/ev-node/sequencers/single v1.0.0-beta.2 github.com/go-kit/kit v0.13.0 diff --git a/go.sum b/go.sum index bd14bbb2..ef7c5bd8 100644 --- a/go.sum +++ b/go.sum @@ -290,10 +290,10 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/evstack/ev-node v1.0.0-beta.8 h1:JxeVadKfk6TnFCEXYfYlBj8c7tQWyOxDECKy7PUgru4= -github.com/evstack/ev-node v1.0.0-beta.8/go.mod h1:n1dCjxdOBe2lMr6//nyeLG+J3q/CFkIqBZ+8Me3Ci0k= -github.com/evstack/ev-node/core v1.0.0-beta.3 h1:01K2Ygm3puX4m2OBxvg/HDxu+he54jeNv+KDmpgujFc= -github.com/evstack/ev-node/core v1.0.0-beta.3/go.mod h1:n2w/LhYQTPsi48m6lMj16YiIqsaQw6gxwjyJvR+B3sY= +github.com/evstack/ev-node v1.0.0-beta.9 h1:9hRfT+EECIxrimhshjfAhER7x8wItFuytznC5jqRHrI= +github.com/evstack/ev-node v1.0.0-beta.9/go.mod h1:+gJ1h9OF6r1rM557emHq7OrMxSI+73gNtKbzMFPK9zU= +github.com/evstack/ev-node/core v1.0.0-beta.4 h1:F/rqHCrZ+ViUY4I6RuoBVvkhYfosD68yo/6gCdGRdmo= +github.com/evstack/ev-node/core v1.0.0-beta.4/go.mod h1:n2w/LhYQTPsi48m6lMj16YiIqsaQw6gxwjyJvR+B3sY= github.com/evstack/ev-node/da v1.0.0-beta.4 h1:6W+UsQrsEdBbAnyy8j+lYNo2VQvJUaoSNkToMFThtVU= github.com/evstack/ev-node/da v1.0.0-beta.4/go.mod h1:O3Lbx4/WFN0DIUOHdTihmyRnGmQwVXdswH19RW/KyG4= github.com/evstack/ev-node/sequencers/single v1.0.0-beta.2 h1:UlQd3WL2p6bBtGMYYok8PUGxUEQJ74rf2XHlCqJF7Z8= diff --git a/pkg/adapter/adapter.go b/pkg/adapter/adapter.go index bb58afbd..8127774a 100644 --- a/pkg/adapter/adapter.go +++ b/pkg/adapter/adapter.go @@ -312,22 +312,7 @@ func (a *Adapter) ExecuteTxs( s, err := a.Store.LoadState(ctx) if err != nil { - // Lazy-initialize ev-abci state for sync nodes on first execution. - // This mirrors InitChain and allows followers to execute height 1. - if a.AppGenesis == nil { - return nil, 0, fmt.Errorf("load state: %w", err) - } - if blockHeight != uint64(a.AppGenesis.InitialHeight) { - return nil, 0, fmt.Errorf("load state: %w", err) - } - a.Logger.Info("Initializing ev-abci state lazily for sync node") - if _, _, initErr := a.InitChain(ctx, a.AppGenesis.GenesisTime, uint64(a.AppGenesis.InitialHeight), a.AppGenesis.ChainID); initErr != nil { - return nil, 0, fmt.Errorf("lazy init chain failed: %w", initErr) - } - s, err = a.Store.LoadState(ctx) - if err != nil { - return nil, 0, fmt.Errorf("load state after init: %w", err) - } + return nil, 0, fmt.Errorf("load state: %w", err) } header, ok := types.HeaderFromContext(ctx) diff --git a/pkg/adapter/convert.go b/pkg/adapter/convert.go index 7210dbe5..94a08d23 100644 --- a/pkg/adapter/convert.go +++ b/pkg/adapter/convert.go @@ -10,11 +10,11 @@ import ( cmttypes "github.com/cometbft/cometbft/types" cmtversion "github.com/cometbft/cometbft/version" - rlktypes "github.com/evstack/ev-node/types" + evtypes "github.com/evstack/ev-node/types" ) // ToABCIHeader converts rollkit header format defined by ABCI. -func ToABCIHeader(header rlktypes.Header, lastCommit *cmttypes.Commit) (cmttypes.Header, error) { +func ToABCIHeader(header evtypes.Header, lastCommit *cmttypes.Commit) (cmttypes.Header, error) { if len(header.ProposerAddress) == 0 { return cmttypes.Header{}, errors.New("proposer address is not set") } @@ -29,9 +29,9 @@ func ToABCIHeader(header rlktypes.Header, lastCommit *cmttypes.Commit) (cmttypes LastBlockID: lastCommit.BlockID, LastCommitHash: lastCommit.Hash(), DataHash: cmbytes.HexBytes(header.DataHash), - ConsensusHash: cmbytes.HexBytes(header.ConsensusHash), + ConsensusHash: cmbytes.HexBytes(make(evtypes.Hash, 32)), AppHash: cmbytes.HexBytes(header.AppHash), - LastResultsHash: cmbytes.HexBytes(header.LastResultsHash), + LastResultsHash: nil, // not set EvidenceHash: new(cmttypes.EvidenceData).Hash(), ProposerAddress: header.ProposerAddress, ChainID: header.ChainID(), @@ -41,7 +41,7 @@ func ToABCIHeader(header rlktypes.Header, lastCommit *cmttypes.Commit) (cmttypes } // ToABCIBlock converts rollit block into block format defined by ABCI. -func ToABCIBlock(header cmttypes.Header, lastCommit *cmttypes.Commit, data *rlktypes.Data) (*cmttypes.Block, error) { +func ToABCIBlock(header cmttypes.Header, lastCommit *cmttypes.Commit, data *evtypes.Data) (*cmttypes.Block, error) { abciBlock := cmttypes.Block{ Header: header, Evidence: cmttypes.EvidenceData{ diff --git a/server/migration_cmd.go b/server/migration_cmd.go index 62474ffe..fcc507c2 100644 --- a/server/migration_cmd.go +++ b/server/migration_cmd.go @@ -281,11 +281,8 @@ func cometBlockToRollkit(block *cmttypes.Block) (*rollkittypes.SignedHeader, *ro App: block.Version.App, }, LastHeaderHash: block.Header.Hash().Bytes(), - LastCommitHash: block.LastCommitHash.Bytes(), DataHash: block.DataHash.Bytes(), - ConsensusHash: block.ConsensusHash.Bytes(), AppHash: block.AppHash.Bytes(), - LastResultsHash: block.LastResultsHash.Bytes(), ValidatorHash: block.ValidatorsHash.Bytes(), ProposerAddress: block.ProposerAddress.Bytes(), }, @@ -394,8 +391,7 @@ func cometbftStateToRollkitState(cometBFTState state.State, daHeight uint64) (ro DAHeight: daHeight, - LastResultsHash: cometBFTState.LastResultsHash, - AppHash: cometBFTState.AppHash, + AppHash: cometBFTState.AppHash, }, nil } diff --git a/server/migration_cmd_test.go b/server/migration_cmd_test.go index 18535048..ecbcd679 100644 --- a/server/migration_cmd_test.go +++ b/server/migration_cmd_test.go @@ -86,11 +86,8 @@ func TestCometBlockToRollkit(t *testing.T) { require.Equal(t, uint64(11), header.Version.Block) require.Equal(t, uint64(1), header.Version.App) require.Equal(t, block.Header.Hash().Bytes(), []byte(header.LastHeaderHash)) - require.Equal(t, []byte("lastcommithash"), []byte(header.LastCommitHash)) require.Equal(t, []byte("datahash"), []byte(header.DataHash)) - require.Equal(t, []byte("consensushash"), []byte(header.ConsensusHash)) require.Equal(t, []byte("apphash"), []byte(header.AppHash)) - require.Equal(t, []byte("lastresultshash"), []byte(header.LastResultsHash)) require.Equal(t, []byte("validatorshash"), []byte(header.ValidatorHash)) require.Equal(t, address.Bytes(), header.ProposerAddress) @@ -202,7 +199,6 @@ func TestCometbftStateToRollkitState(t *testing.T) { require.Equal(t, uint64(blockHeight), rollkitState.LastBlockHeight) require.Equal(t, blockTime, rollkitState.LastBlockTime) require.Equal(t, daHeight, rollkitState.DAHeight) - require.Equal(t, []byte("lastresultshash"), []byte(rollkitState.LastResultsHash)) require.Equal(t, []byte("apphash"), []byte(rollkitState.AppHash)) } From be000d5e070be1e8ffefd7247e6f2bb81d7fe099 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Mon, 10 Nov 2025 11:44:09 +0100 Subject: [PATCH 2/4] updates --- .github/workflows/integration_test.yml | 14 ++++++-------- .github/workflows/migration_test.yml | 2 +- Dockerfile | 2 +- tests/integration/go.mod | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index c9399a37..abe0062e 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -23,7 +23,7 @@ jobs: env: IGNITE_VERSION: v29.3.0 # the gm build script depends on some annotations IGNITE_EVOLVE_APP_VERSION: main - EVNODE_VERSION: v1.0.0-beta.8 + EVNODE_VERSION: v1.0.0-beta.9 steps: - uses: actions/checkout@v5 @@ -102,7 +102,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 env: - EVNODE_VERSION: "v1.0.0-beta.8" + EVNODE_VERSION: "v1.0.0-beta.9" IGNITE_VERSION: "v29.6.1" IGNITE_EVOLVE_APP_VERSION: "main" # use tagged when apps has tagged (blocked on things) EVOLVE_IMAGE_REPO: "evolve-gm" @@ -145,7 +145,7 @@ jobs: timeout-minutes: 30 env: DO_NOT_TRACK: true - EVNODE_VERSION: "v1.0.0-beta.8" + EVNODE_VERSION: "v1.0.0-beta.9" IGNITE_VERSION: "v29.6.1" IGNITE_EVOLVE_APP_VERSION: "main" # use tagged when apps has tagged (blocked on things) outputs: @@ -352,8 +352,7 @@ jobs: GMD_HOME: ${{ needs.liveness.outputs.gmd_home }} HERMES_VERSION: "v1.13.1" GAIA_VERSION: "v25.1.0" - EVNODE_VERSION: "v1.0.0-beta.8" - EVNODE_DA_VERSION: "v1.0.0-beta.1" + EVNODE_VERSION: "v1.0.0-beta.9" steps: - name: Set up Go uses: actions/setup-go@v6 @@ -395,7 +394,7 @@ jobs: - name: Start Local DA run: | - go install github.com/rollkit/rollkit/da/cmd/local-da@$EVNODE_DA_VERSION # TODO rename after tag and replaces gone + go install github.com/evstack/ev-node/da/cmd/local-da@main # start the local da in the background local-da & # capture the background process PID @@ -575,8 +574,7 @@ jobs: timeout-minutes: 30 env: DO_NOT_TRACK: true - EVNODE_VERSION: "v1.0.0-beta.8" - EVNODE_DA_VERSION: "v1.0.0-beta.1" + EVNODE_VERSION: "v1.0.0-beta.9" IGNITE_VERSION: "v29.6.1" IGNITE_EVOLVE_APP_VERSION: "main" GAIA_VERSION: "v25.1.0" diff --git a/.github/workflows/migration_test.yml b/.github/workflows/migration_test.yml index 3d6ecf3b..6b878357 100644 --- a/.github/workflows/migration_test.yml +++ b/.github/workflows/migration_test.yml @@ -11,7 +11,7 @@ permissions: packages: write # needed for GHCR push env: - EVNODE_VERSION: "v1.0.0-beta.8" + EVNODE_VERSION: "v1.0.0-beta.9" IGNITE_VERSION: "v29.6.1" IGNITE_EVOLVE_APP_VERSION: "main" # use tagged when apps has tagged (blocked on things) EVOLVE_IMAGE_REPO: "ghcr.io/evstack/evolve-abci-gm" diff --git a/Dockerfile b/Dockerfile index 6404b0b3..f4c4502a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN apk add --no-cache \ bash # Set environment variables -ENV EVNODE_VERSION=v1.0.0-beta.8 +ENV EVNODE_VERSION=v1.0.0-beta.9 ENV IGNITE_VERSION=v29.6.1 ENV IGNITE_EVOLVE_APP_VERSION=main diff --git a/tests/integration/go.mod b/tests/integration/go.mod index ed3252a3..9890fa19 100644 --- a/tests/integration/go.mod +++ b/tests/integration/go.mod @@ -17,7 +17,7 @@ require ( github.com/cosmos/cosmos-sdk v0.50.14 github.com/cosmos/ibc-go/v8 v8.7.0 github.com/evstack/ev-abci v0.4.2 - github.com/evstack/ev-node v1.0.0-beta.8 + github.com/evstack/ev-node v1.0.0-beta.9 github.com/pelletier/go-toml/v2 v2.2.4 google.golang.org/grpc v1.75.1 google.golang.org/protobuf v1.36.10 From d1a8cd4a19bd60e81ac088a89e04c352607001f6 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Mon, 10 Nov 2025 12:01:13 +0100 Subject: [PATCH 3/4] go mod tidy --- tests/integration/go.mod | 2 +- tests/integration/go.sum | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/integration/go.mod b/tests/integration/go.mod index 9890fa19..94b2b1e6 100644 --- a/tests/integration/go.mod +++ b/tests/integration/go.mod @@ -204,7 +204,7 @@ require ( golang.org/x/arch v0.17.0 // indirect golang.org/x/crypto v0.43.0 // indirect golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect - golang.org/x/net v0.45.0 // indirect + golang.org/x/net v0.46.0 // indirect golang.org/x/sync v0.17.0 // indirect golang.org/x/sys v0.37.0 // indirect golang.org/x/term v0.36.0 // indirect diff --git a/tests/integration/go.sum b/tests/integration/go.sum index e038f39d..8a307616 100644 --- a/tests/integration/go.sum +++ b/tests/integration/go.sum @@ -319,8 +319,8 @@ github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cn github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk= github.com/evstack/ev-abci v0.4.2 h1:PXOeN19EKo20H/VMpTMvQSBZy2bh3t//rx95310bwGE= github.com/evstack/ev-abci v0.4.2/go.mod h1:Fdz0/dgvRFFAH+CPuNdpiwmBNyiLJPsire21YD83gHo= -github.com/evstack/ev-node v1.0.0-beta.8 h1:JxeVadKfk6TnFCEXYfYlBj8c7tQWyOxDECKy7PUgru4= -github.com/evstack/ev-node v1.0.0-beta.8/go.mod h1:n1dCjxdOBe2lMr6//nyeLG+J3q/CFkIqBZ+8Me3Ci0k= +github.com/evstack/ev-node v1.0.0-beta.9 h1:9hRfT+EECIxrimhshjfAhER7x8wItFuytznC5jqRHrI= +github.com/evstack/ev-node v1.0.0-beta.9/go.mod h1:+gJ1h9OF6r1rM557emHq7OrMxSI+73gNtKbzMFPK9zU= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= @@ -1012,8 +1012,8 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM= -golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= +golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4= +golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= From 805c2a5b2274202807b0e665e9f2983155b415eb Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Mon, 10 Nov 2025 12:56:49 +0100 Subject: [PATCH 4/4] fix --- attester/main.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/attester/main.go b/attester/main.go index b7f26999..935ffc6e 100644 --- a/attester/main.go +++ b/attester/main.go @@ -992,12 +992,9 @@ func getEvolveHeader(node string, height int64) (*evolvetypes.Header, error) { // Parse hex fields lastHeaderHash, _ := hex.DecodeString(header.LastBlockID.Hash) - lastCommitHash, _ := hex.DecodeString(header.LastCommitHash) dataHash, _ := hex.DecodeString(header.DataHash) validatorsHash, _ := hex.DecodeString(header.ValidatorsHash) - consensusHash, _ := hex.DecodeString(header.ConsensusHash) appHash, _ := hex.DecodeString(header.AppHash) - lastResultsHash, _ := hex.DecodeString(header.LastResultsHash) proposerAddress, _ := hex.DecodeString(header.ProposerAddress) // Parse version @@ -1015,11 +1012,8 @@ func getEvolveHeader(node string, height int64) (*evolvetypes.Header, error) { App: appVersion, }, LastHeaderHash: lastHeaderHash, - LastCommitHash: lastCommitHash, DataHash: dataHash, - ConsensusHash: consensusHash, AppHash: appHash, - LastResultsHash: lastResultsHash, ProposerAddress: proposerAddress, ValidatorHash: validatorsHash, }