Skip to content

Commit 121e16f

Browse files
alpealpe
authored
Merge branch 'main' into alex/remote_netinfo
2 parents c922db1 + 4252154 commit 121e16f

File tree

17 files changed

+74
-82
lines changed

17 files changed

+74
-82
lines changed

‎.github/workflows/goreleaser.yml‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎.github/workflows/release.yml‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@ name: Release
22
on:
33
push:
44
tags:
5-
- '**/v*.*.*' # Matches tags like evm/single/v0.2.0, testapp/v0.4.0, etc.
5+
- "**/v*.*.*" # Matches tags like apps/evm/single/v0.2.0, apps/testapp/v0.4.0, etc.
6+
workflow_dispatch:
7+
inputs:
8+
tag:
9+
description: "Tag to release (e.g., apps/evm/single/v0.2.0, apps/testapp/v0.4.0) - Must match Go tag."
10+
required: true
11+
type: string
612

713
permissions: {}
814
jobs:
@@ -23,7 +29,12 @@ jobs:
2329
- name: Parse tag and validate app
2430
id: parse
2531
run: |
26-
TAG="${{ github.ref_name }}"
32+
# Use input tag for workflow_dispatch, otherwise use ref_name
33+
if [ -n "${{ inputs.tag }}" ]; then
34+
TAG="${{ inputs.tag }}"
35+
else
36+
TAG="${{ github.ref_name }}"
37+
fi
2738
echo "Processing tag: $TAG"
2839
2940
# Extract version (everything after the last /)
@@ -34,25 +45,26 @@ jobs:
3445
APP_PATH="${TAG%/*}"
3546
echo "app-path=$APP_PATH" >> $GITHUB_OUTPUT
3647
37-
# Check if the app directory exists in ./apps/
38-
if [ ! -d "apps/$APP_PATH" ]; then
39-
echo "::error::App directory 'apps/$APP_PATH' does not exist"
48+
# Check if the app directory exists
49+
if [ ! -d "$APP_PATH" ]; then
50+
echo "::error::App directory '$APP_PATH' does not exist"
4051
exit 1
4152
fi
4253
4354
# Check if Dockerfile exists
44-
if [ ! -f "apps/$APP_PATH/Dockerfile" ]; then
45-
echo "::error::Dockerfile not found in 'apps/$APP_PATH/'"
55+
if [ ! -f "$APP_PATH/Dockerfile" ]; then
56+
echo "::error::Dockerfile not found in '$APP_PATH/'"
4657
exit 1
4758
fi
4859
49-
echo "dockerfile=apps/$APP_PATH/Dockerfile" >> $GITHUB_OUTPUT
60+
echo "dockerfile=$APP_PATH/Dockerfile" >> $GITHUB_OUTPUT
5061
51-
# Generate image name from app path (replace / with -)
52-
IMAGE_NAME="ev-node-${APP_PATH//\//-}"
62+
# Generate image name from app path (strip apps/ prefix, replace / with -)
63+
IMAGE_PATH="${APP_PATH#apps/}"
64+
IMAGE_NAME="ev-node-${IMAGE_PATH//\//-}"
5365
echo "image-name=$IMAGE_NAME" >> $GITHUB_OUTPUT
5466
55-
echo "::notice::Building $IMAGE_NAME version $VERSION from apps/$APP_PATH"
67+
echo "::notice::Building $IMAGE_NAME version $VERSION from $APP_PATH"
5668
5769
build-and-push:
5870
name: Build and Push Docker Image

‎apps/evm/entrypoint.sh‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,31 @@ get_home_dir() {
3030
# Get the home directory (either from --home flag or default)
3131
CONFIG_HOME=$(get_home_dir "$@")
3232

33+
# Create config directory
34+
mkdir -p "$CONFIG_HOME"
35+
36+
# Create passphrase file if environment variable is set
37+
PASSPHRASE_FILE="$CONFIG_HOME/passphrase.txt"
38+
if [ -n "$EVM_SIGNER_PASSPHRASE" ]; then
39+
echo "$EVM_SIGNER_PASSPHRASE" > "$PASSPHRASE_FILE"
40+
chmod 600 "$PASSPHRASE_FILE"
41+
fi
42+
43+
# Create JWT secret file if environment variable is set
44+
JWT_SECRET_FILE="$CONFIG_HOME/jwt.hex"
45+
if [ -n "$EVM_JWT_SECRET" ]; then
46+
echo "$EVM_JWT_SECRET" > "$JWT_SECRET_FILE"
47+
chmod 600 "$JWT_SECRET_FILE"
48+
fi
49+
3350
if [ ! -f "$CONFIG_HOME/config/node_key.json" ]; then
3451

3552
# Build init flags array
3653
init_flags="--home=$CONFIG_HOME"
3754

3855
# Add required flags if environment variables are set
3956
if [ -n "$EVM_SIGNER_PASSPHRASE" ]; then
40-
init_flags="$init_flags --rollkit.node.aggregator=true --rollkit.signer.passphrase $EVM_SIGNER_PASSPHRASE"
57+
init_flags="$init_flags --evnode.node.aggregator=true --evnode.signer.passphrase_file $PASSPHRASE_FILE"
4158
fi
4259

4360
INIT_COMMAND="evm init $init_flags"
@@ -52,7 +69,7 @@ default_flags="--home=$CONFIG_HOME"
5269

5370
# Add required flags if environment variables are set
5471
if [ -n "$EVM_JWT_SECRET" ]; then
55-
default_flags="$default_flags --evm.jwt-secret $EVM_JWT_SECRET"
72+
default_flags="$default_flags --evm.jwt-secret-file $JWT_SECRET_FILE"
5673
fi
5774

5875
if [ -n "$EVM_GENESIS_HASH" ]; then
@@ -68,28 +85,28 @@ if [ -n "$EVM_ETH_URL" ]; then
6885
fi
6986

7087
if [ -n "$EVM_BLOCK_TIME" ]; then
71-
default_flags="$default_flags --rollkit.node.block_time $EVM_BLOCK_TIME"
88+
default_flags="$default_flags --evnode.node.block_time $EVM_BLOCK_TIME"
7289
fi
7390

7491
if [ -n "$EVM_SIGNER_PASSPHRASE" ]; then
75-
default_flags="$default_flags --rollkit.node.aggregator=true --rollkit.signer.passphrase $EVM_SIGNER_PASSPHRASE"
92+
default_flags="$default_flags --evnode.node.aggregator=true --evnode.signer.passphrase_file $PASSPHRASE_FILE"
7693
fi
7794

7895
# Conditionally add DA-related flags
7996
if [ -n "$DA_ADDRESS" ]; then
80-
default_flags="$default_flags --rollkit.da.address $DA_ADDRESS"
97+
default_flags="$default_flags --evnode.da.address $DA_ADDRESS"
8198
fi
8299

83100
if [ -n "$DA_AUTH_TOKEN" ]; then
84-
default_flags="$default_flags --rollkit.da.auth_token $DA_AUTH_TOKEN"
101+
default_flags="$default_flags --evnode.da.auth_token $DA_AUTH_TOKEN"
85102
fi
86103

87104
if [ -n "$DA_NAMESPACE" ]; then
88-
default_flags="$default_flags --rollkit.da.namespace $DA_NAMESPACE"
105+
default_flags="$default_flags --evnode.da.namespace $DA_NAMESPACE"
89106
fi
90107

91108
if [ -n "$DA_SIGNING_ADDRESSES" ]; then
92-
default_flags="$default_flags --rollkit.da.signing_addresses $DA_SIGNING_ADDRESSES"
109+
default_flags="$default_flags --evnode.da.signing_addresses $DA_SIGNING_ADDRESSES"
93110
fi
94111

95112
# If no arguments passed, show help

‎apps/evm/go.mod‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,12 @@ module github.com/evstack/ev-node/apps/evm
22

33
go 1.25.0
44

5-
replace (
6-
github.com/evstack/ev-node => ../../
7-
github.com/evstack/ev-node/execution/evm => ../../execution/evm
8-
)
9-
105
require (
116
github.com/celestiaorg/go-header v0.8.1
127
github.com/ethereum/go-ethereum v1.16.8
13-
github.com/evstack/ev-node v1.0.0-beta.10
8+
github.com/evstack/ev-node v1.0.0-rc.1
149
github.com/evstack/ev-node/core v1.0.0-rc.1
15-
github.com/evstack/ev-node/execution/evm v1.0.0-beta.3
10+
github.com/evstack/ev-node/execution/evm v1.0.0-rc.1
1611
github.com/ipfs/go-datastore v0.9.0
1712
github.com/rs/zerolog v1.34.0
1813
github.com/spf13/cobra v1.10.2

‎apps/evm/go.sum‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,8 +409,12 @@ github.com/ethereum/go-ethereum v1.16.8 h1:LLLfkZWijhR5m6yrAXbdlTeXoqontH+Ga2f9i
409409
github.com/ethereum/go-ethereum v1.16.8/go.mod h1:Fs6QebQbavneQTYcA39PEKv2+zIjX7rPUZ14DER46wk=
410410
github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cnFk8=
411411
github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk=
412+
github.com/evstack/ev-node v1.0.0-rc.1 h1:MO7DT3y1X4WK7pTgl/867NroqhXJ/oe2NbmvMr3jqq8=
413+
github.com/evstack/ev-node v1.0.0-rc.1/go.mod h1:JtbvY2r6k6ZhGYMeDNZk7cx6ALj3d0f6dVyyJmJHBd4=
412414
github.com/evstack/ev-node/core v1.0.0-rc.1 h1:Dic2PMUMAYUl5JW6DkDj6HXDEWYzorVJQuuUJOV0FjE=
413415
github.com/evstack/ev-node/core v1.0.0-rc.1/go.mod h1:n2w/LhYQTPsi48m6lMj16YiIqsaQw6gxwjyJvR+B3sY=
416+
github.com/evstack/ev-node/execution/evm v1.0.0-rc.1 h1:CrjlRI6hufue3KozvDuKP14gLwFvnOmXfGEJIszGEcQ=
417+
github.com/evstack/ev-node/execution/evm v1.0.0-rc.1/go.mod h1:GUxGZgS9F4w6DOcS5gEdW1h71IdAGdaY8C1urSOkpUQ=
414418
github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
415419
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
416420
github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=

‎apps/grpc/go.mod‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,10 @@ module github.com/evstack/ev-node/apps/grpc
22

33
go 1.25.0
44

5-
replace (
6-
github.com/evstack/ev-node => ../../
7-
github.com/evstack/ev-node/execution/grpc => ../../execution/grpc
8-
)
9-
105
require (
11-
github.com/evstack/ev-node v1.0.0-beta.11
6+
github.com/evstack/ev-node v1.0.0-rc.1
127
github.com/evstack/ev-node/core v1.0.0-rc.1
13-
github.com/evstack/ev-node/execution/grpc v0.0.0
8+
github.com/evstack/ev-node/execution/grpc v1.0.0-rc.1
149
github.com/ipfs/go-datastore v0.9.0
1510
github.com/rs/zerolog v1.34.0
1611
github.com/spf13/cobra v1.10.2

‎apps/grpc/go.sum‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,12 @@ github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6Ni
365365
github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
366366
github.com/envoyproxy/protoc-gen-validate v1.0.1/go.mod h1:0vj8bNkYbSTNS2PIyH87KZaeN4x9zpL9Qt8fQC7d+vs=
367367
github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
368+
github.com/evstack/ev-node v1.0.0-rc.1 h1:MO7DT3y1X4WK7pTgl/867NroqhXJ/oe2NbmvMr3jqq8=
369+
github.com/evstack/ev-node v1.0.0-rc.1/go.mod h1:JtbvY2r6k6ZhGYMeDNZk7cx6ALj3d0f6dVyyJmJHBd4=
368370
github.com/evstack/ev-node/core v1.0.0-rc.1 h1:Dic2PMUMAYUl5JW6DkDj6HXDEWYzorVJQuuUJOV0FjE=
369371
github.com/evstack/ev-node/core v1.0.0-rc.1/go.mod h1:n2w/LhYQTPsi48m6lMj16YiIqsaQw6gxwjyJvR+B3sY=
372+
github.com/evstack/ev-node/execution/grpc v1.0.0-rc.1 h1:OzrWLDDY6/9+LWx0XmUqPzxs/CHZRJICOwQ0Me/i6dY=
373+
github.com/evstack/ev-node/execution/grpc v1.0.0-rc.1/go.mod h1:Pr/sF6Zx8am9ZeWFcoz1jYPs0kXmf+OmL8Tz2Gyq7E4=
370374
github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
371375
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
372376
github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=

‎apps/testapp/go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ module github.com/evstack/ev-node/apps/testapp
22

33
go 1.25.0
44

5-
replace github.com/evstack/ev-node => ../../.
6-
75
require (
86
github.com/celestiaorg/go-header v0.8.1
9-
github.com/evstack/ev-node v1.0.0-beta.10
7+
github.com/evstack/ev-node v1.0.0-rc.1
108
github.com/evstack/ev-node/core v1.0.0-rc.1
119
github.com/ipfs/go-datastore v0.9.0
1210
github.com/rs/zerolog v1.34.0

‎apps/testapp/go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,8 @@ github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6Ni
365365
github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
366366
github.com/envoyproxy/protoc-gen-validate v1.0.1/go.mod h1:0vj8bNkYbSTNS2PIyH87KZaeN4x9zpL9Qt8fQC7d+vs=
367367
github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
368+
github.com/evstack/ev-node v1.0.0-rc.1 h1:MO7DT3y1X4WK7pTgl/867NroqhXJ/oe2NbmvMr3jqq8=
369+
github.com/evstack/ev-node v1.0.0-rc.1/go.mod h1:JtbvY2r6k6ZhGYMeDNZk7cx6ALj3d0f6dVyyJmJHBd4=
368370
github.com/evstack/ev-node/core v1.0.0-rc.1 h1:Dic2PMUMAYUl5JW6DkDj6HXDEWYzorVJQuuUJOV0FjE=
369371
github.com/evstack/ev-node/core v1.0.0-rc.1/go.mod h1:n2w/LhYQTPsi48m6lMj16YiIqsaQw6gxwjyJvR+B3sY=
370372
github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=

‎execution/evm/go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.25.0
44

55
require (
66
github.com/ethereum/go-ethereum v1.16.8
7-
github.com/evstack/ev-node v1.0.0-beta.10
7+
github.com/evstack/ev-node v1.0.0-rc.1
88
github.com/evstack/ev-node/core v1.0.0-rc.1
99
github.com/golang-jwt/jwt/v5 v5.3.0
1010
github.com/ipfs/go-datastore v0.9.0
@@ -103,5 +103,3 @@ require (
103103
gopkg.in/yaml.v3 v3.0.1 // indirect
104104
lukechampine.com/blake3 v1.4.1 // indirect
105105
)
106-
107-
replace github.com/evstack/ev-node => ../../

0 commit comments

Comments
 (0)