Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 16 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ Choose **one** of the following:

```bash
# Initialize a Celestia light node (creates keyring directory)
celestia light init --p2p.network mocha-4
celestia light init --p2p.network mocha-5

# Add a new key to the keyring
celestia-appd keys add my_celes_key --keyring-backend test \
--home ~/.celestia-light-mocha-4
--home ~/.celestia-light-mocha-5

# Display the address to fund with TIA
celestia-appd keys show my_celes_key --keyring-backend test \
--home ~/.celestia-light-mocha-4 -a
--home ~/.celestia-light-mocha-5 -a

# Fund this address with TIA from:
# - Mocha faucet: https://faucet.celestia-mocha.com/
Expand Down Expand Up @@ -100,10 +100,10 @@ Or using CLI flags:
./bin/da-server \
--celestia.namespace="00000000000000000000000000000000000000000000000000000000acfe" \
--celestia.server="http://localhost:26658" \
--celestia.tx-client.core-grpc.addr="consensus-full-mocha-4.celestia-mocha.com:9090" \
--celestia.tx-client.keyring-path="$HOME/.celestia-light-mocha-4/keys" \
--celestia.tx-client.core-grpc.addr="rpc-mocha.pops.one:9090" \
--celestia.tx-client.keyring-path="$HOME/.celestia-light-mocha-5/keys" \
--celestia.tx-client.key-name="my_celes_key" \
--celestia.tx-client.p2p-network="mocha-4"
--celestia.tx-client.p2p-network="mocha-5"
```

## Configuration
Expand All @@ -127,7 +127,7 @@ Or using CLI flags:
| `--celestia.tx-client.core-grpc.addr` | `OP_ALTDA_CELESTIA_TX_CLIENT_CORE_GRPC_ADDR` | **(required)** | CoreGRPC endpoint |
| `--celestia.tx-client.core-grpc.tls-enabled` | `OP_ALTDA_CELESTIA_TX_CLIENT_CORE_GRPC_TLS_ENABLED` | `true` | Enable TLS for CoreGRPC |
| `--celestia.tx-client.core-grpc.auth-token` | `OP_ALTDA_CELESTIA_TX_CLIENT_CORE_GRPC_AUTH_TOKEN` | | CoreGRPC auth token |
| `--celestia.tx-client.p2p-network` | `OP_ALTDA_CELESTIA_TX_CLIENT_P2P_NETWORK` | `mocha-4` | Network: mocha-4, arabica-11, celestia |
| `--celestia.tx-client.p2p-network` | `OP_ALTDA_CELESTIA_TX_CLIENT_P2P_NETWORK` | `mocha-5` | Network: mocha-5, arabica-11, celestia |

#### Signer Configuration

Expand Down Expand Up @@ -182,16 +182,16 @@ port = 3100
[celestia]
namespace = "00000000000000000000000000000000000000000000000000000000acfe"
bridge_addr = "http://localhost:26658"
core_grpc_addr = "consensus-full-mocha-4.celestia-mocha.com:9090"
p2p_network = "mocha-4"
core_grpc_addr = "rpc-mocha.pops.one:9090"
p2p_network = "mocha-5"

# Signer configuration - choose ONE mode
[celestia.signer]
mode = "local" # or "popsigner"

# Local keyring settings
[celestia.signer.local]
keyring_path = "~/.celestia-light-mocha-4/keys"
keyring_path = "~/.celestia-light-mocha-5/keys"
key_name = "my_celes_key"

# POPSigner settings (when mode = "popsigner")
Expand Down Expand Up @@ -260,8 +260,8 @@ Fallback failures are non-fatal and logged as warnings.
```bash
./bin/da-server \
--celestia.namespace="$NAMESPACE" \
--celestia.tx-client.keyring-path="$HOME/.celestia-light-mocha-4/keys" \
--celestia.tx-client.core-grpc.addr="consensus-full-mocha-4.celestia-mocha.com:9090" \
--celestia.tx-client.keyring-path="$HOME/.celestia-light-mocha-5/keys" \
--celestia.tx-client.core-grpc.addr="rpc-mocha.pops.one:9090" \
--fallback.enabled=true \
--fallback.s3.bucket="my-da-fallback" \
--fallback.s3.region="us-east-1"
Expand Down Expand Up @@ -358,10 +358,10 @@ Ensure your keyring path is correct and contains the specified key:
```bash
# List keys in keyring
celestia-appd keys list --keyring-backend test \
--home ~/.celestia-light-mocha-4
--home ~/.celestia-light-mocha-5

# Verify keyring path exists
ls -la ~/.celestia-light-mocha-4/keys/
ls -la ~/.celestia-light-mocha-5/keys/
```

### "insufficient funds"
Expand All @@ -371,7 +371,7 @@ Your Celestia account needs TIA to pay for transaction fees:
```bash
# Check balance
celestia-appd query bank balances $(celestia-appd keys show my_celes_key -a \
--keyring-backend test --home ~/.celestia-light-mocha-4) \
--keyring-backend test --home ~/.celestia-light-mocha-5) \
--node https://rpc-mocha.pops.one:443
```

Expand All @@ -381,7 +381,7 @@ Verify the CoreGRPC endpoint is accessible:

```bash
# Test connection
grpcurl -plaintext consensus-full-mocha-4.celestia-mocha.com:9090 list
grpcurl -plaintext rpc-mocha.pops.one:9090 list
```

## License
Expand Down
2 changes: 1 addition & 1 deletion celestia_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"time"

nodeblob "github.com/celestiaorg/celestia-node/blob"
libshare "github.com/celestiaorg/go-square/v3/share"
libshare "github.com/celestiaorg/go-square/v4/share"
"github.com/celestiaorg/op-alt-da/fallback"
"github.com/celestiaorg/op-alt-da/metrics"
altda "github.com/ethereum-optimism/optimism/op-alt-da"
Expand Down
2 changes: 1 addition & 1 deletion celestia_storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
blobAPI "github.com/celestiaorg/celestia-node/nodebuilder/blob"
"github.com/celestiaorg/celestia-node/nodebuilder/p2p"
"github.com/celestiaorg/celestia-node/state"
libshare "github.com/celestiaorg/go-square/v3/share"
libshare "github.com/celestiaorg/go-square/v4/share"
"github.com/celestiaorg/op-alt-da/signer"
altda "github.com/ethereum-optimism/optimism/op-alt-da"
"github.com/ethereum/go-ethereum/log"
Expand Down
2 changes: 1 addition & 1 deletion celestia_storage_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

nodeblob "github.com/celestiaorg/celestia-node/blob"
blobAPI "github.com/celestiaorg/celestia-node/nodebuilder/blob"
libshare "github.com/celestiaorg/go-square/v3/share"
libshare "github.com/celestiaorg/go-square/v4/share"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/daserver/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ type CelestiaConfig struct {
CoreGRPCAuthToken string `toml:"core_grpc_auth_token"`
CoreGRPCTLSEnabled bool `toml:"core_grpc_tls_enabled"`

// P2P network (mocha-4, arabica-11, celestia)
// P2P network (mocha-5, arabica-11, celestia)
P2PNetwork string `toml:"p2p_network"`

// Parallel submission settings
Expand Down Expand Up @@ -160,7 +160,7 @@ func DefaultConfig() Config {
CoreGRPCAddr: "",
CoreGRPCAuthToken: "",
CoreGRPCTLSEnabled: true,
P2PNetwork: "mocha-4",
P2PNetwork: "mocha-5",
TxWorkerAccounts: 0,
Signer: signer.DefaultConfig(),
// Legacy fields (for backwards compatibility)
Expand Down
2 changes: 1 addition & 1 deletion cmd/daserver/config_legacy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func TestValidate_LegacyAWSKMSConfig(t *testing.T) {
cfg := DefaultConfig()
cfg.Celestia.Namespace = strings.Repeat("0", 58)
cfg.Celestia.CoreGRPCAddr = "localhost:9090"
cfg.Celestia.P2PNetwork = "mocha-4"
cfg.Celestia.P2PNetwork = "mocha-5"
cfg.Celestia.KeyringBackend = "awskms"
cfg.Celestia.DefaultKeyName = "alias/op-alt-da/signer"
cfg.Celestia.AWSKMS.Region = "us-east-1"
Expand Down
12 changes: 12 additions & 0 deletions cmd/daserver/config_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package main

import "testing"

func TestDefaultP2PNetwork(t *testing.T) {
if got := DefaultConfig().Celestia.P2PNetwork; got != "mocha-5" {
t.Fatalf("expected default p2p network %q, got %q", "mocha-5", got)
}
if got := CelestiaP2PNetworkFlag.Value; got != "mocha-5" {
t.Fatalf("expected default p2p network flag %q, got %q", "mocha-5", got)
}
}
6 changes: 3 additions & 3 deletions cmd/daserver/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ var (
}
CelestiaKeyringPathFlag = &cli.StringFlag{
Name: CelestiaKeyringPathFlagName,
Usage: "celestia tx client keyring path e.g. ~/.celestia-light-mocha-4/keys",
Usage: "celestia tx client keyring path e.g. ~/.celestia-light-mocha-5/keys",
Value: "",
EnvVars: prefixEnvVars("CELESTIA_TX_CLIENT_KEYRING_PATH"),
}
Expand All @@ -141,8 +141,8 @@ var (
}
CelestiaP2PNetworkFlag = &cli.StringFlag{
Name: CelestiaP2PNetworkFlagName,
Usage: "celestia tx client p2p network (mocha-4, arabica-11, celestia)",
Value: "mocha-4",
Usage: "celestia tx client p2p network (mocha-5, arabica-11, celestia)",
Value: "mocha-5",
EnvVars: prefixEnvVars("CELESTIA_TX_CLIENT_P2P_NETWORK"),
}
CelestiaSignerModeFlag = &cli.StringFlag{
Expand Down
14 changes: 7 additions & 7 deletions config.toml.example
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ bridge_tls_enabled = false
# gRPC endpoint for transaction submission to consensus.
# Examples:
# - Local: localhost:9090
# - Mocha: consensus-full-mocha-4.celestia-mocha.com:9090
# - Mocha: rpc-mocha.pops.one:9090

core_grpc_addr = "consensus-full-mocha-4.celestia-mocha.com:9090"
core_grpc_addr = "rpc-mocha.pops.one:9090"
core_grpc_auth_token = ""
core_grpc_tls_enabled = true

# P2P network: mocha-4, arabica-11, celestia
p2p_network = "mocha-4"
# P2P network: mocha-5, arabica-11, celestia
p2p_network = "mocha-5"

# Parallel submission (0 = immediate, 1 = queued, >1 = parallel workers)
tx_worker_accounts = 0
Expand All @@ -87,13 +87,13 @@ mode = "local"
# Uses a local filesystem keyring for signing.
#
# Setup:
# 1. Initialize: celestia light init --p2p.network mocha-4
# 1. Initialize: celestia light init --p2p.network mocha-5
# 2. Create key: celestia-appd keys add my_celes_key --keyring-backend test \
# --home ~/.celestia-light-mocha-4
# --home ~/.celestia-light-mocha-5
# 3. Fund the address with TIA

[celestia.signer.local]
keyring_path = "~/.celestia-light-mocha-4/keys"
keyring_path = "~/.celestia-light-mocha-5/keys"
key_name = "my_celes_key"

# ------------------------------------------------------------------------------
Expand Down
Loading
Loading