Skip to content

Commit b5c6592

Browse files
authored
chore: bump evolve and ignite (#283)
* chore: bump evolve and ignite * test
1 parent e905b0b commit b5c6592

11 files changed

Lines changed: 57 additions & 43 deletions

File tree

.github/workflows/integration_test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
runs-on: ubuntu-latest
1717
timeout-minutes: 30
1818
env:
19-
EVNODE_VERSION: "v1.0.0-beta.6"
20-
IGNITE_VERSION: "v29.4.0"
19+
EVNODE_VERSION: "v1.0.0-beta.7"
20+
IGNITE_VERSION: "v29.5.0"
2121
IGNITE_EVOLVE_APP_VERSION: "main" # use tagged when apps has tagged (blocked on things)
2222
EVOLVE_IMAGE_REPO: "evolve-gm"
2323
EVOLVE_IMAGE_TAG: "latest"
@@ -59,8 +59,8 @@ jobs:
5959
timeout-minutes: 30
6060
env:
6161
DO_NOT_TRACK: true
62-
EVNODE_VERSION: "v1.0.0-beta.6"
63-
IGNITE_VERSION: "v29.4.0"
62+
EVNODE_VERSION: "v1.0.0-beta.7"
63+
IGNITE_VERSION: "v29.5.0"
6464
IGNITE_EVOLVE_APP_VERSION: "main" # use tagged when apps has tagged (blocked on things)
6565
outputs:
6666
carol_mnemonic: ${{ steps.save_mnemonic.outputs.carol_mnemonic }}
@@ -266,7 +266,7 @@ jobs:
266266
GMD_HOME: ${{ needs.liveness.outputs.gmd_home }}
267267
HERMES_VERSION: "v1.13.1"
268268
GAIA_VERSION: "v25.1.0"
269-
EVNODE_VERSION: "v1.0.0-beta.6"
269+
EVNODE_VERSION: "v1.0.0-beta.7"
270270
EVNODE_DA_VERSION: "v1.0.0-beta.1"
271271
steps:
272272
- name: Set up Go

.github/workflows/migration_test.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ name: Cosmos SDK to Evolve Migration Test
22

33
on:
44
push:
5-
branches: [ "main" ]
5+
branches: ["main"]
66
pull_request:
77
workflow_dispatch:
88

99
permissions:
1010
contents: read
11-
packages: write # needed for GHCR push
11+
packages: write # needed for GHCR push
1212

1313
env:
14-
EVNODE_VERSION: "v1.0.0-beta.6"
15-
IGNITE_VERSION: "v29.4.0"
14+
EVNODE_VERSION: "v1.0.0-beta.7"
15+
IGNITE_VERSION: "v29.5.0"
1616
IGNITE_EVOLVE_APP_VERSION: "main" # use tagged when apps has tagged (blocked on things)
1717
EVOLVE_IMAGE_REPO: "ghcr.io/evstack/evolve-abci-gm"
1818
COSMOS_SDK_IMAGE_REPO: "ghcr.io/evstack/cosmos-sdk-gm"
@@ -75,7 +75,6 @@ jobs:
7575
cache-from: type=gha
7676
cache-to: type=gha,mode=max
7777

78-
7978
docker-build-evolve-image:
8079
name: Build Evolve Docker Image
8180
runs-on: ubuntu-latest

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ RUN apk add --no-cache \
77
bash
88

99
# Set environment variables
10-
ENV EVNODE_VERSION=v1.0.0-beta.6
11-
ENV IGNITE_VERSION=v29.3.1
10+
ENV EVNODE_VERSION=v1.0.0-beta.7
11+
ENV IGNITE_VERSION=v29.5.0
1212
ENV IGNITE_EVOLVE_APP_VERSION=main
1313

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

Dockerfile.cosmos-sdk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN apk add --no-cache \
77
bash
88

99
# Set environment variables
10-
ENV IGNITE_VERSION=v29.3.1
10+
ENV IGNITE_VERSION=v29.5.0
1111

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

@@ -40,4 +40,4 @@ USER gm
4040
# expose common ports
4141
EXPOSE 26657 26656 9090 1317
4242

43-
CMD ["gmd"]
43+
CMD ["gmd"]

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
github.com/cosmos/cosmos-proto v1.0.0-beta.5
2828
github.com/cosmos/cosmos-sdk v0.50.14
2929
github.com/cosmos/gogoproto v1.7.0
30-
github.com/evstack/ev-node v1.0.0-beta.6.0.20251008193305-05124cc3a34a
30+
github.com/evstack/ev-node v1.0.0-beta.7
3131
github.com/evstack/ev-node/core v1.0.0-beta.3
3232
github.com/evstack/ev-node/da v1.0.0-beta.4
3333
github.com/evstack/ev-node/sequencers/single v1.0.0-beta.2

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m
290290
github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
291291
github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
292292
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
293-
github.com/evstack/ev-node v1.0.0-beta.6.0.20251008193305-05124cc3a34a h1:v4JxPL+foGnQUuRN1v1R78uCH8x27U0EN72/kqZCSzk=
294-
github.com/evstack/ev-node v1.0.0-beta.6.0.20251008193305-05124cc3a34a/go.mod h1:ZBPhcwYpIyQ8XoI3POAJ/aG5UBV/WMpfHZFF4gUJDok=
293+
github.com/evstack/ev-node v1.0.0-beta.7 h1:gQOygA4l7VUbO84MuuMo6E9zP0Cn/Afuwq1K9Ng2z8Q=
294+
github.com/evstack/ev-node v1.0.0-beta.7/go.mod h1:ZBPhcwYpIyQ8XoI3POAJ/aG5UBV/WMpfHZFF4gUJDok=
295295
github.com/evstack/ev-node/core v1.0.0-beta.3 h1:01K2Ygm3puX4m2OBxvg/HDxu+he54jeNv+KDmpgujFc=
296296
github.com/evstack/ev-node/core v1.0.0-beta.3/go.mod h1:n2w/LhYQTPsi48m6lMj16YiIqsaQw6gxwjyJvR+B3sY=
297297
github.com/evstack/ev-node/da v1.0.0-beta.4 h1:6W+UsQrsEdBbAnyy8j+lYNo2VQvJUaoSNkToMFThtVU=

pkg/adapter/adapter_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,10 @@ func TestExecuteFiresEvents(t *testing.T) {
117117
Signer: signer,
118118
Signature: sig,
119119
}
120-
require.NoError(t, adapter.RollkitStore.SaveBlockData(ctx, signedHeader, &types.Data{Txs: make(types.Txs, 0)}, &sigT))
120+
batch, err := adapter.RollkitStore.NewBatch(ctx)
121+
require.NoError(t, err)
122+
require.NoError(t, batch.SaveBlockData(signedHeader, &types.Data{Txs: make(types.Txs, 0)}, &sigT))
123+
require.NoError(t, batch.Commit())
121124
require.NoError(t, adapter.Store.SaveState(ctx, execstore.TestingStateFixture()))
122125

123126
// when

pkg/adapter/signature_compatibility_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,11 @@ func TestSignatureCompatibility_HeaderAndCommit(t *testing.T) {
9696
Header: *header,
9797
Signature: types.Signature(make([]byte, 64)),
9898
}
99-
err = storeOnlyAdapter.RollkitStore.SaveBlockData(context.Background(), signedHeader1, &types.Data{}, &types.Signature{})
99+
100+
batch, err := storeOnlyAdapter.RollkitStore.NewBatch(context.Background())
100101
require.NoError(t, err)
102+
require.NoError(t, batch.SaveBlockData(signedHeader1, &types.Data{}, &types.Signature{}))
103+
require.NoError(t, batch.Commit())
101104

102105
// Generate and save BlockID for height 2
103106
lastCommit2, err := storeOnlyAdapter.GetLastCommit(context.Background(), header2.Height())

server/migration_cmd.go

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,11 @@ After migration, start the node normally - it will automatically detect and use
148148
// the migration is done in reverse order, starting from the last block
149149
missedBlocks := make(map[int64]bool)
150150

151+
batch, err := rollkitStores.rollkitStore.NewBatch(ctx)
152+
if err != nil {
153+
return fmt.Errorf("failed to create batch: %w", err)
154+
}
155+
151156
for height := lastBlockHeight; height > 0; height-- {
152157
cmd.Printf("Migrating block %d...\n", height)
153158

@@ -165,7 +170,7 @@ After migration, start the node normally - it will automatically detect and use
165170

166171
header, data, signature := cometBlockToRollkit(block)
167172

168-
if err = rollkitStores.rollkitStore.SaveBlockData(ctx, header, data, &signature); err != nil {
173+
if err = batch.SaveBlockData(header, data, &signature); err != nil {
169174
return fmt.Errorf("failed to save block data: %w", err)
170175
}
171176

@@ -193,15 +198,19 @@ After migration, start the node normally - it will automatically detect and use
193198
}
194199

195200
// set the last height in the Rollkit store
196-
if err = rollkitStores.rollkitStore.SetHeight(ctx, uint64(lastBlockHeight)); err != nil {
201+
if err = batch.SetHeight(uint64(lastBlockHeight)); err != nil {
197202
return fmt.Errorf("failed to set last height in Evolve store: %w", err)
198203
}
199204

200205
// persist the rollkit state at the after SetHeight is called.
201-
if err = rollkitStores.rollkitStore.UpdateState(ctx, rollkitState); err != nil {
206+
if err = batch.UpdateState(rollkitState); err != nil {
202207
return fmt.Errorf("failed to update evolve state at height %d: %w", lastBlockHeight, err)
203208
}
204209

210+
if err = batch.Commit(); err != nil {
211+
return fmt.Errorf("failed to commit batch: %w", err)
212+
}
213+
205214
cmd.Println("Seeding sync stores head with latest migrated header/data ...")
206215
if err := rollkitStores.headerSyncStore.Start(ctx); err != nil {
207216
return fmt.Errorf("failed to start header sync store: %w", err)

tests/integration/go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ require (
1111

1212
require (
1313
connectrpc.com/connect v1.19.0
14-
github.com/evstack/ev-node v1.0.0-beta.6
14+
github.com/evstack/ev-node v1.0.0-beta.7
1515
)
1616

1717
require (
18-
github.com/celestiaorg/go-square/v3 v3.0.1 // indirect
18+
github.com/celestiaorg/go-square/v3 v3.0.2 // indirect
1919
github.com/dgraph-io/ristretto/v2 v2.1.0 // indirect
2020
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
2121
github.com/golang/mock v1.6.0 // indirect
@@ -34,7 +34,7 @@ require (
3434
github.com/ugorji/go/codec v1.2.11 // indirect
3535
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 // indirect
3636
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.37.0 // indirect
37-
go.yaml.in/yaml/v2 v2.4.2 // indirect
37+
go.yaml.in/yaml/v2 v2.4.3 // indirect
3838
go.yaml.in/yaml/v3 v3.0.4 // indirect
3939
)
4040

@@ -76,7 +76,7 @@ require (
7676
github.com/aws/smithy-go v1.22.5 // indirect
7777
github.com/beorn7/perks v1.0.1 // indirect
7878
github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
79-
github.com/celestiaorg/nmt v0.24.1 // indirect
79+
github.com/celestiaorg/nmt v0.24.2 // indirect
8080
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
8181
github.com/cespare/xxhash/v2 v2.3.0 // indirect
8282
github.com/cockroachdb/errors v1.11.3 // indirect
@@ -190,15 +190,15 @@ require (
190190
github.com/zondax/ledger-go v1.0.0 // indirect
191191
go.etcd.io/bbolt v1.4.0-alpha.0.0.20240404170359-43604f3112c5 // indirect
192192
go.opencensus.io v0.24.0 // indirect
193-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
193+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
194194
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
195195
go.opentelemetry.io/otel v1.38.0 // indirect
196196
go.opentelemetry.io/otel/metric v1.38.0 // indirect
197197
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
198198
go.opentelemetry.io/otel/trace v1.38.0 // indirect
199199
go.uber.org/multierr v1.11.0 // indirect
200200
golang.org/x/crypto v0.42.0 // indirect
201-
golang.org/x/exp v0.0.0-20250811191247-51f88131bc50 // indirect
201+
golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect
202202
golang.org/x/net v0.44.0 // indirect
203203
golang.org/x/sync v0.17.0 // indirect
204204
golang.org/x/sys v0.36.0 // indirect
@@ -208,7 +208,7 @@ require (
208208
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
209209
google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 // indirect
210210
google.golang.org/grpc v1.75.0
211-
google.golang.org/protobuf v1.36.9
211+
google.golang.org/protobuf v1.36.10
212212
gopkg.in/yaml.v3 v3.0.1 // indirect
213213
gotest.tools/v3 v3.5.2 // indirect
214214
nhooyr.io/websocket v1.8.6 // indirect

0 commit comments

Comments
 (0)