Skip to content

Commit bb9284d

Browse files
julienrbrtjulienrbrt
authored
Merge branch 'main' into julien/fi
2 parents 272027d + 3a9c9ba commit bb9284d

File tree

8 files changed

+23
-27
lines changed

8 files changed

+23
-27
lines changed

‎.github/workflows/ghcr-prune.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- local-da
3131
steps:
3232
- name: Delete stale tags
33-
uses: actions/github-script@v7
33+
uses: actions/github-script@v8
3434
env:
3535
PACKAGE_NAME: ${{ matrix.package }}
3636
OVERRIDE_RETENTION: ${{ github.event.inputs.retention-days }}

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
**/**.go
2727
go.mod
2828
go.sum
29-
- uses: golangci/golangci-lint-action@v8.0.0
29+
- uses: golangci/golangci-lint-action@v9.0.0
3030
with:
3131
version: latest
3232
args: --timeout 10m

‎block/internal/submitting/da_submitter.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -364,20 +364,20 @@ func mergeSubmitOptions(baseOptions []byte, signingAddress string) ([]byte, erro
364364
return baseOptions, nil
365365
}
366366

367-
var optionsMap map[string]interface{}
367+
var optionsMap map[string]any
368368

369369
// If base options are provided, try to parse them as JSON
370370
if len(baseOptions) > 0 {
371371
// Try to unmarshal existing options, ignoring errors for non-JSON input
372372
if err := json.Unmarshal(baseOptions, &optionsMap); err != nil {
373373
// Not valid JSON - start with empty map
374-
optionsMap = make(map[string]interface{})
374+
optionsMap = make(map[string]any)
375375
}
376376
}
377377

378378
// Ensure map is initialized even if unmarshal returned nil
379379
if optionsMap == nil {
380-
optionsMap = make(map[string]interface{})
380+
optionsMap = make(map[string]any)
381381
}
382382

383383
// Add or override the signing address

‎block/internal/submitting/da_submitter_options_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestMergeSubmitOptions_EmptyBaseOptions(t *testing.T) {
2222
result, err := mergeSubmitOptions([]byte{}, signingAddress)
2323
require.NoError(t, err)
2424

25-
var resultMap map[string]interface{}
25+
var resultMap map[string]any
2626
err = json.Unmarshal(result, &resultMap)
2727
require.NoError(t, err)
2828

@@ -36,7 +36,7 @@ func TestMergeSubmitOptions_ValidJSON(t *testing.T) {
3636
result, err := mergeSubmitOptions(baseOptions, signingAddress)
3737
require.NoError(t, err)
3838

39-
var resultMap map[string]interface{}
39+
var resultMap map[string]any
4040
err = json.Unmarshal(result, &resultMap)
4141
require.NoError(t, err)
4242

@@ -52,7 +52,7 @@ func TestMergeSubmitOptions_InvalidJSON(t *testing.T) {
5252
result, err := mergeSubmitOptions(baseOptions, signingAddress)
5353
require.NoError(t, err)
5454

55-
var resultMap map[string]interface{}
55+
var resultMap map[string]any
5656
err = json.Unmarshal(result, &resultMap)
5757
require.NoError(t, err)
5858

@@ -68,7 +68,7 @@ func TestMergeSubmitOptions_OverrideExistingAddress(t *testing.T) {
6868
result, err := mergeSubmitOptions(baseOptions, newAddress)
6969
require.NoError(t, err)
7070

71-
var resultMap map[string]interface{}
71+
var resultMap map[string]any
7272
err = json.Unmarshal(result, &resultMap)
7373
require.NoError(t, err)
7474

@@ -82,7 +82,7 @@ func TestMergeSubmitOptions_NilBaseOptions(t *testing.T) {
8282
result, err := mergeSubmitOptions(nil, signingAddress)
8383
require.NoError(t, err)
8484

85-
var resultMap map[string]interface{}
85+
var resultMap map[string]any
8686
err = json.Unmarshal(result, &resultMap)
8787
require.NoError(t, err)
8888

@@ -102,17 +102,17 @@ func TestMergeSubmitOptions_ComplexJSON(t *testing.T) {
102102
result, err := mergeSubmitOptions(baseOptions, signingAddress)
103103
require.NoError(t, err)
104104

105-
var resultMap map[string]interface{}
105+
var resultMap map[string]any
106106
err = json.Unmarshal(result, &resultMap)
107107
require.NoError(t, err)
108108

109109
// Check nested structure is preserved
110-
nested, ok := resultMap["nested"].(map[string]interface{})
110+
nested, ok := resultMap["nested"].(map[string]any)
111111
require.True(t, ok)
112112
assert.Equal(t, "value", nested["key"])
113113

114114
// Check array is preserved
115-
array, ok := resultMap["array"].([]interface{})
115+
array, ok := resultMap["array"].([]any)
116116
require.True(t, ok)
117117
assert.Len(t, array, 3)
118118

‎test/docker-e2e/docker_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/cosmos/cosmos-sdk/x/auth"
2323
"github.com/cosmos/cosmos-sdk/x/bank"
2424
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
25-
dockerclient "github.com/moby/moby/client"
2625
"github.com/stretchr/testify/suite"
2726
)
2827

@@ -52,14 +51,14 @@ type DockerTestSuite struct {
5251
celestia *cosmos.Chain
5352
daNetwork *da.Network
5453
evNodeChain *evstack.Chain
55-
dockerClient *dockerclient.Client
54+
dockerClient tastoratypes.TastoraDockerClient
5655
dockerNetworkID string
5756
}
5857

5958
// setupDockerEnvironment sets up the basic Docker environment
6059
func (s *DockerTestSuite) setupDockerEnvironment() {
6160
t := s.T()
62-
client, network := tastoradocker.DockerSetup(t)
61+
client, network := tastoradocker.Setup(t)
6362

6463
// Store client and network ID in the suite for later use
6564
s.dockerClient = client

‎test/docker-e2e/go.mod‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ go 1.24.6
44

55
require (
66
cosmossdk.io/math v1.5.3
7-
// TODO(reviewer): Update to tagged release once tastora is merged and tagged
8-
github.com/celestiaorg/tastora v0.7.6-0.20251106081541-3ec2da2f1f7f
7+
github.com/celestiaorg/tastora v0.8.0
98
github.com/ethereum/go-ethereum v1.16.6
109
github.com/evstack/ev-node/execution/evm v1.0.0-beta.3
1110
github.com/stretchr/testify v1.11.1
@@ -17,7 +16,7 @@ require (
1716
github.com/StackExchange/wmi v1.2.1 // indirect
1817
github.com/bits-and-blooms/bitset v1.20.0 // indirect
1918
github.com/celestiaorg/go-square/v3 v3.0.2 // indirect
20-
github.com/consensys/gnark-crypto v0.18.0 // indirect
19+
github.com/consensys/gnark-crypto v0.18.1 // indirect
2120
github.com/containerd/continuity v0.4.5 // indirect
2221
github.com/crate-crypto/go-eth-kzg v1.4.0 // indirect
2322
github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a // indirect
@@ -177,7 +176,7 @@ require (
177176
github.com/minio/highwayhash v1.0.3 // indirect
178177
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
179178
github.com/moby/docker-image-spec v1.3.1 // indirect
180-
github.com/moby/moby v28.3.3+incompatible
179+
github.com/moby/moby v28.3.3+incompatible // indirect
181180
github.com/moby/sys/sequential v0.6.0 // indirect
182181
github.com/mtibben/percent v0.2.1 // indirect
183182
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect

‎test/docker-e2e/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ github.com/celestiaorg/go-square/v3 v3.0.2 h1:eSQOgNII8inK9IhiBZ+6GADQeWbRq4HYY7
133133
github.com/celestiaorg/go-square/v3 v3.0.2/go.mod h1:oFReMLsSDMRs82ICFEeFQFCqNvwdsbIM1BzCcb0f7dM=
134134
github.com/celestiaorg/nmt v0.24.2 h1:LlpJSPOd6/Lw1Ig6HUhZuqiINHLka/ZSRTBzlNJpchg=
135135
github.com/celestiaorg/nmt v0.24.2/go.mod h1:vgLBpWBi8F5KLxTdXSwb7AU4NhiIQ1AQRGa+PzdcLEA=
136-
github.com/celestiaorg/tastora v0.7.6-0.20251106081541-3ec2da2f1f7f h1:vTcOubI4Bab0RCE1i9APbbmhJviFA52wv/XV43NwE9M=
137-
github.com/celestiaorg/tastora v0.7.6-0.20251106081541-3ec2da2f1f7f/go.mod h1:Xw44XeRN2T/kSdopVCJjNhwFwRSO58wTW8GrVP7OWFI=
136+
github.com/celestiaorg/tastora v0.8.0 h1:+FWAIsP2onwwqPTGzBLIBtx8B1h9sImdx4msv2N4DsI=
137+
github.com/celestiaorg/tastora v0.8.0/go.mod h1:9b5GsL/+pKEw3HZG/nd3qhnGadUnNNoTBygy9HeGIyw=
138138
github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
139139
github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
140140
github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
@@ -180,8 +180,8 @@ github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:
180180
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
181181
github.com/cometbft/cometbft-db v0.14.1 h1:SxoamPghqICBAIcGpleHbmoPqy+crij/++eZz3DlerQ=
182182
github.com/cometbft/cometbft-db v0.14.1/go.mod h1:KHP1YghilyGV/xjD5DP3+2hyigWx0WTp9X+0Gnx0RxQ=
183-
github.com/consensys/gnark-crypto v0.18.0 h1:vIye/FqI50VeAr0B3dx+YjeIvmc3LWz4yEfbWBpTUf0=
184-
github.com/consensys/gnark-crypto v0.18.0/go.mod h1:L3mXGFTe1ZN+RSJ+CLjUt9x7PNdx8ubaYfDROyp2Z8c=
183+
github.com/consensys/gnark-crypto v0.18.1 h1:RyLV6UhPRoYYzaFnPQA4qK3DyuDgkTgskDdoGqFt3fI=
184+
github.com/consensys/gnark-crypto v0.18.1/go.mod h1:L3mXGFTe1ZN+RSJ+CLjUt9x7PNdx8ubaYfDROyp2Z8c=
185185
github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4=
186186
github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE=
187187
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=

‎test/docker-e2e/upgrade_test.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@ func TestEVMSingleUpgradeSuite(t *testing.T) {
5959
func (s *EVMSingleUpgradeTestSuite) TestEVMSingleUpgrade() {
6060
ctx := context.Background()
6161

62-
s.Run("setup_docker", func() {
63-
s.setupDockerEnvironment()
64-
})
62+
s.setupDockerEnvironment()
6563

6664
s.Run("setup_celestia_and_DA_bridge", func() {
6765
s.celestia = s.CreateChain()

0 commit comments

Comments
 (0)