Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Celestia integration #68

Draft
wants to merge 5 commits into
base: integration
Choose a base branch
from
Draft

Celestia integration #68

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4e58e66
Celestia integration
Sneh1999 Nov 24, 2024
07c4d3e
Remove l3 smoke test
Sneh1999 Nov 24, 2024
cff153e
Fix the batch poster
ImJeremyHe Dec 2, 2024
da587f3
Merge pull request #71 from EspressoSystems/jh/fix
ImJeremyHe Dec 2, 2024
947fb44
Update migration test for TEE integration (#73)
zacshowa Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions .github/workflows/smoke-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,7 @@ jobs:
smoke_test:
strategy:
matrix:
test-script:
[
./smoke-test.bash,
./smoke-test-l3.bash,
./smoke-test-nitro-simple.bash,
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we dont need all these tests for celestia integration

./smoke-test-full-node.bash,
./smoke-test-espresso-finality-node.bash,
./smoke-test-altlayer.bash,
./smoke-test-caldera.bash,
]
test-script: [./smoke-test.bash]

runs-on: ubuntu-24.04

Expand Down
19 changes: 19 additions & 0 deletions ngrok.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
version: 3
agent:
authtoken: 4WbBxrSPTeyFPqqttL3oJ_26L6T88VKRJxfukSamH8D
tunnels:
tunnel1:
addr: 127.0.0.1:8546
proto: http
schemes:
- http
tunnel2:
addr: 127.0.0.1:41000
proto: http
schemes:
- http
tunnel3:
addr: 127.0.0.1:9642
proto: http
schemes:
- http
7 changes: 3 additions & 4 deletions rollupcreator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
FROM node:18-bullseye-slim
ARG NITRO_CONTRACTS_BRANCH=main
ARG NITRO_CONTRACTS_REPO=https://github.com/OffchainLabs/nitro-contracts.git
ARG NITRO_CONTRACTS_BRANCH=celestia-integration
ARG NITRO_CONTRACTS_REPO=https://github.com/EspressoSystems/nitro-contracts.git
RUN apt-get update && \
apt-get install -y git docker.io python3 build-essential curl jq
WORKDIR /workspace
RUN git clone --no-checkout ${NITRO_CONTRACTS_REPO} ./
RUN git checkout ${NITRO_CONTRACTS_BRANCH}
RUN git clone --branch ${NITRO_CONTRACTS_BRANCH} --recurse-submodules ${NITRO_CONTRACTS_REPO} ./
RUN curl -L https://foundry.paradigm.xyz | bash
ENV PATH="${PATH}:/root/.foundry/bin"
RUN foundryup
Expand Down
28 changes: 1 addition & 27 deletions scripts/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ function writeConfigs(argv: any) {
url: argv.validationNodeUrl,
jwtsecret: valJwtSecret,
},
"dangerous": {"reset-block-validation": false},
dangerous: { "reset-block-validation": false },
},
feed: {
input: {
Expand Down Expand Up @@ -292,15 +292,8 @@ function writeConfigs(argv: any) {

if (argv.espresso) {
let config = baseConfig as any;
config.node["block-validator"]["espresso"] = false;
config.node["block-validator"]["light-client-address"] = "";
config.node["batch-poster"]["hotshot-url"] = "";
config.node["batch-poster"]["light-client-address"] = "";
config.node["transaction-streamer"] = {
"sovereign-sequencer-enabled": false,
"hotshot-url": "",
"espresso-namespace": 412346,
};
}

baseConfig.node["data-availability"]["sequencer-inbox-address"] =
Expand All @@ -318,12 +311,6 @@ function writeConfigs(argv: any) {
simpleConfig.node["delayed-sequencer"].enable = true;
simpleConfig.node["batch-poster"].enable = true;
simpleConfig.node["batch-poster"]["redis-url"] = "";
if (argv.espresso) {
simpleConfig.node["transaction-streamer"]["hotshot-url"] =
argv.espressoUrl;
simpleConfig.node["transaction-streamer"]["sovereign-sequencer-enabled"] =
true;
}
simpleConfig.execution["sequencer"].enable = true;

if (argv.anytrust) {
Expand All @@ -334,9 +321,6 @@ function writeConfigs(argv: any) {
simpleConfig.node["batch-poster"]["hotshot-url"] = argv.espressoUrl;
simpleConfig.node["batch-poster"]["light-client-address"] =
argv.lightClientAddress;
simpleConfig.node["block-validator"]["espresso"] = true;
simpleConfig.node["block-validator"]["light-client-address"] =
argv.lightClientAddress;
simpleConfig.node["block-validator"]["dangerous"][
"reset-block-validation"
] = true;
Expand Down Expand Up @@ -386,9 +370,6 @@ function writeConfigs(argv: any) {
validatorConfig.node.staker.enable = true;
validatorConfig.node.staker["use-smart-contract-wallet"] = true;
if (argv.espresso) {
validatorConfig.node["block-validator"]["espresso"] = true;
validatorConfig.node["block-validator"]["light-client-address"] =
argv.lightClientAddress;
validatorConfig.node["block-validator"]["dangerous"][
"reset-block-validation"
] = true;
Expand All @@ -412,7 +393,6 @@ function writeConfigs(argv: any) {
sequencerConfig.node["delayed-sequencer"].enable = true;

if (argv.espresso) {
sequencerConfig.execution.sequencer["enable-espresso-sovereign"] = true;
sequencerConfig.node.feed.output.enable = true;
sequencerConfig.node.dangerous["no-sequencer-coordinator"] = true;
} else {
Expand All @@ -422,7 +402,6 @@ function writeConfigs(argv: any) {
if (argv.espresso && argv.enableEspressoFinalityNode) {
sequencerConfig.execution.sequencer["enable-espresso-finality-node"] =
true;
sequencerConfig.execution.sequencer["enable-espresso-sovereign"] = false;
sequencerConfig.execution.sequencer["espresso-finality-node-config"] = {
"hotshot-url": argv.espressoUrl,
"start-block": 0,
Expand All @@ -445,10 +424,6 @@ function writeConfigs(argv: any) {
posterConfig.node["batch-poster"]["hotshot-url"] = argv.espressoUrl;
posterConfig.node["batch-poster"]["light-client-address"] =
argv.lightClientAddress;
posterConfig.node["transaction-streamer"]["hotshot-url"] =
argv.espressoUrl;
posterConfig.node["transaction-streamer"]["sovereign-sequencer-enabled"] =
true;
} else {
posterConfig.node["seq-coordinator"].enable = true;
}
Expand Down Expand Up @@ -481,7 +456,6 @@ function writeConfigs(argv: any) {
l3Config.node["batch-poster"].enable = true;
l3Config.node["batch-poster"]["redis-url"] = "";
if (argv.espresso) {
l3Config.execution.sequencer["enable-espresso-sovereign"] = true;
l3Config.node.feed.output.enable = true;
l3Config.node.dangerous["no-sequencer-coordinator"] = true;
}
Expand Down
4 changes: 2 additions & 2 deletions test-node.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.1.0-0e716c8
DEFAULT_NITRO_CONTRACTS_VERSION="99c07a7db2fcce75b751c5a2bd4936e898cda065"
DEFAULT_TOKEN_BRIDGE_VERSION="v1.2.2"

ESPRESSO_VERSION=ghcr.io/espressosystems/nitro-espresso-integration/nitro-node-dev:latest
ESPRESSO_VERSION=ghcr.io/espressosystems/nitro-espresso-integration/nitro-node-dev:celestia-integration

# Set default versions if not overriden by provided env vars
: ${NITRO_CONTRACTS_REPO:=$DEFAULT_NITRO_CONTRACTS_REPO}
Expand Down Expand Up @@ -317,7 +317,7 @@ done

if $espresso; then
NITRO_CONTRACTS_REPO=https://github.com/EspressoSystems/nitro-contracts.git
NITRO_CONTRACTS_BRANCH=develop
NITRO_CONTRACTS_BRANCH=celestia-integration
export NITRO_CONTRACTS_REPO
export NITRO_CONTRACTS_BRANCH
echo "Running espresso mode"
Expand Down
Loading