Skip to content

Commit 0a4c8a4

Browse files
chattonchatton
authored
Merge branch 'main' into cian/enable-tests-to-run-without-infra
2 parents 1990e85 + 6e0bd9a commit 0a4c8a4

73 files changed

Lines changed: 2447 additions & 2777 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/benchmark.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
steps:
113113
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
114114
- name: Download EVM benchmark results
115-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
115+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
116116
with:
117117
name: evm-benchmark-results
118118

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,12 @@ jobs:
129129
steps:
130130
- uses: actions/checkout@v6.0.2
131131
- name: Download unit test coverage report
132-
uses: actions/download-artifact@v8.0.0
132+
uses: actions/download-artifact@v8.0.1
133133
with:
134134
name: unit-test-coverage-report-${{ github.sha }}
135135
path: ./unit-coverage
136136
- name: Download integration test coverage report
137-
uses: actions/download-artifact@v8.0.0
137+
uses: actions/download-artifact@v8.0.1
138138
with:
139139
name: integration-test-coverage-report-${{ github.sha }}
140140
path: ./integration-coverage

‎CHANGELOG.md‎

Lines changed: 135 additions & 54 deletions
Large diffs are not rendered by default.

‎Cargo.lock‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/evm/cmd/run.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"github.com/evstack/ev-node/pkg/config"
2424
blobrpc "github.com/evstack/ev-node/pkg/da/jsonrpc"
2525
da "github.com/evstack/ev-node/pkg/da/types"
26-
"github.com/evstack/ev-node/pkg/genesis"
2726
genesispkg "github.com/evstack/ev-node/pkg/genesis"
2827
"github.com/evstack/ev-node/pkg/p2p/key"
2928
"github.com/evstack/ev-node/pkg/sequencers/based"
@@ -84,7 +83,7 @@ var RunCmd = &cobra.Command{
8483
}
8584

8685
// Create sequencer based on configuration
87-
sequencer, err := createSequencer(logger, datastore, nodeConfig, genesis, daClient, executor)
86+
sequencer, err := createSequencer(cmd.Context(), logger, datastore, nodeConfig, genesis, daClient, executor)
8887
if err != nil {
8988
return err
9089
}
@@ -145,10 +144,11 @@ func init() {
145144
// If BasedSequencer is enabled, it creates a based sequencer that fetches transactions from DA.
146145
// Otherwise, it creates a single (traditional) sequencer.
147146
func createSequencer(
147+
ctx context.Context,
148148
logger zerolog.Logger,
149149
datastore datastore.Batching,
150150
nodeConfig config.Config,
151-
genesis genesis.Genesis,
151+
genesis genesispkg.Genesis,
152152
daClient block.FullDAClient,
153153
executor execution.Executor,
154154
) (coresequencer.Sequencer, error) {
@@ -158,7 +158,7 @@ func createSequencer(
158158
return nil, fmt.Errorf("based sequencer mode requires aggregator mode to be enabled")
159159
}
160160

161-
basedSeq, err := based.NewBasedSequencer(daClient, nodeConfig, datastore, genesis, logger, executor)
161+
basedSeq, err := based.NewBasedSequencer(ctx, daClient, nodeConfig, datastore, genesis, logger, executor)
162162
if err != nil {
163163
return nil, fmt.Errorf("failed to create based sequencer: %w", err)
164164
}

‎apps/evm/go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ replace (
99

1010
require (
1111
github.com/ethereum/go-ethereum v1.17.1
12-
github.com/evstack/ev-node v1.0.0-rc.5
12+
github.com/evstack/ev-node v1.0.0
1313
github.com/evstack/ev-node/core v1.0.0
14-
github.com/evstack/ev-node/execution/evm v1.0.0-rc.4
14+
github.com/evstack/ev-node/execution/evm v1.0.0
1515
github.com/ipfs/go-datastore v0.9.1
1616
github.com/rs/zerolog v1.34.0
1717
github.com/spf13/cobra v1.10.2
@@ -191,16 +191,16 @@ require (
191191
go.uber.org/zap v1.27.1 // indirect
192192
go.yaml.in/yaml/v2 v2.4.3 // indirect
193193
go.yaml.in/yaml/v3 v3.0.4 // indirect
194-
golang.org/x/crypto v0.48.0 // indirect
194+
golang.org/x/crypto v0.49.0 // indirect
195195
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect
196-
golang.org/x/mod v0.32.0 // indirect
197-
golang.org/x/net v0.51.0 // indirect
196+
golang.org/x/mod v0.33.0 // indirect
197+
golang.org/x/net v0.52.0 // indirect
198198
golang.org/x/sync v0.20.0 // indirect
199-
golang.org/x/sys v0.41.0 // indirect
200-
golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2 // indirect
201-
golang.org/x/text v0.34.0 // indirect
199+
golang.org/x/sys v0.42.0 // indirect
200+
golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4 // indirect
201+
golang.org/x/text v0.35.0 // indirect
202202
golang.org/x/time v0.12.0 // indirect
203-
golang.org/x/tools v0.41.0 // indirect
203+
golang.org/x/tools v0.42.0 // indirect
204204
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
205205
gonum.org/v1/gonum v0.17.0 // indirect
206206
google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 // indirect

‎apps/evm/go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,8 +1154,8 @@ golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72
11541154
golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
11551155
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
11561156
golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
1157-
golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
1158-
golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
1157+
golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
1158+
golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
11591159
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
11601160
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
11611161
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1220,8 +1220,8 @@ golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
12201220
golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
12211221
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
12221222
golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
1223-
golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
1224-
golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
1223+
golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
1224+
golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
12251225
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
12261226
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
12271227
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1293,8 +1293,8 @@ golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
12931293
golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
12941294
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
12951295
golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
1296-
golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo=
1297-
golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y=
1296+
golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
1297+
golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
12981298
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
12991299
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
13001300
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1452,10 +1452,10 @@ golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
14521452
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
14531453
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
14541454
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1455-
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
1456-
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
1457-
golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2 h1:O1cMQHRfwNpDfDJerqRoE2oD+AFlyid87D40L/OkkJo=
1458-
golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2/go.mod h1:b7fPSJ0pKZ3ccUh8gnTONJxhn3c/PS6tyzQvyqw4iA8=
1455+
golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
1456+
golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
1457+
golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4 h1:bTLqdHv7xrGlFbvf5/TXNxy/iUwwdkjhqQTJDjW7aj0=
1458+
golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4/go.mod h1:g5NllXBEermZrmR51cJDQxmJUHUOfRAaNyWBM+R+548=
14591459
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
14601460
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
14611461
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -1495,8 +1495,8 @@ golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
14951495
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
14961496
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
14971497
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
1498-
golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
1499-
golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
1498+
golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
1499+
golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
15001500
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
15011501
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
15021502
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -1572,8 +1572,8 @@ golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
15721572
golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
15731573
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
15741574
golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
1575-
golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
1576-
golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
1575+
golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
1576+
golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
15771577
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
15781578
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
15791579
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎apps/evm/server/force_inclusion_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func (m *mockDA) Get(ctx context.Context, ids []da.ID, namespace []byte) ([]da.B
5050
return nil, nil
5151
}
5252

53-
func (m *mockDA) Subscribe(_ context.Context, _ []byte) (<-chan da.SubscriptionEvent, error) {
53+
func (m *mockDA) Subscribe(_ context.Context, _ []byte, _ bool) (<-chan da.SubscriptionEvent, error) {
5454
// Not needed in these tests; return a closed channel.
5555
ch := make(chan da.SubscriptionEvent)
5656
close(ch)

‎apps/grpc/cmd/run.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func createSequencer(
121121
return nil, fmt.Errorf("based sequencer mode requires aggregator mode to be enabled")
122122
}
123123

124-
basedSeq, err := based.NewBasedSequencer(daClient, nodeConfig, datastore, genesis, logger, executor)
124+
basedSeq, err := based.NewBasedSequencer(ctx, daClient, nodeConfig, datastore, genesis, logger, executor)
125125
if err != nil {
126126
return nil, fmt.Errorf("failed to create based sequencer: %w", err)
127127
}

‎apps/grpc/go.mod‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ replace (
88
)
99

1010
require (
11-
github.com/evstack/ev-node v1.0.0-rc.5
11+
github.com/evstack/ev-node v1.0.0
1212
github.com/evstack/ev-node/core v1.0.0
1313
github.com/evstack/ev-node/execution/grpc v1.0.0-rc.1
1414
github.com/ipfs/go-datastore v0.9.1
@@ -96,7 +96,6 @@ require (
9696
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
9797
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
9898
github.com/minio/sha256-simd v1.0.1 // indirect
99-
github.com/mitchellh/mapstructure v1.5.0 // indirect
10099
github.com/mr-tron/base58 v1.2.0 // indirect
101100
github.com/multiformats/go-base32 v0.1.0 // indirect
102101
github.com/multiformats/go-base36 v0.2.0 // indirect
@@ -169,16 +168,16 @@ require (
169168
go.uber.org/zap v1.27.1 // indirect
170169
go.yaml.in/yaml/v2 v2.4.3 // indirect
171170
go.yaml.in/yaml/v3 v3.0.4 // indirect
172-
golang.org/x/crypto v0.48.0 // indirect
171+
golang.org/x/crypto v0.49.0 // indirect
173172
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect
174-
golang.org/x/mod v0.32.0 // indirect
175-
golang.org/x/net v0.51.0 // indirect
173+
golang.org/x/mod v0.33.0 // indirect
174+
golang.org/x/net v0.52.0 // indirect
176175
golang.org/x/sync v0.20.0 // indirect
177-
golang.org/x/sys v0.41.0 // indirect
178-
golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2 // indirect
179-
golang.org/x/text v0.34.0 // indirect
176+
golang.org/x/sys v0.42.0 // indirect
177+
golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4 // indirect
178+
golang.org/x/text v0.35.0 // indirect
180179
golang.org/x/time v0.12.0 // indirect
181-
golang.org/x/tools v0.41.0 // indirect
180+
golang.org/x/tools v0.42.0 // indirect
182181
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
183182
gonum.org/v1/gonum v0.17.0 // indirect
184183
google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 // indirect

0 commit comments

Comments
 (0)