Skip to content

Commit

Permalink
adjust env config
Browse files Browse the repository at this point in the history
  • Loading branch information
ZzzzHui committed Dec 13, 2024
1 parent 1887fa9 commit cfb1a11
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 28 deletions.
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ env:
@echo export CARTESI_TEST_POSTGRES_ENDPOINT="postgres://test_user:password@localhost:5432/test_rollupsdb?sslmode=disable"
@echo export CARTESI_TEST_MACHINE_IMAGES_PATH=\"$(CARTESI_TEST_MACHINE_IMAGES_PATH)\"
@echo export PATH=$(CURDIR):$$PATH
@echo export ESPRESSO_BASE_URL="https://query.decaf.testnet.espresso.network/v0"
@echo export ESPRESSO_STARTING_BLOCK="882494"
@echo export ESPRESSO_BASE_URL="https://query.decaf.testnet.espresso.network"
@echo export ESPRESSO_STARTING_BLOCK="977675"
@echo export ESPRESSO_NAMESPACE="55555"
@echo export MAIN_SEQUENCER="espresso" # set to either espresso or ethereum
4 changes: 1 addition & 3 deletions internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ type NodeConfig struct {
EspressoStartingBlock uint64
EspressoNamespace uint64
EspressoServiceEndpoint string
MainSequencer string
}

// Auth is used to sign transactions.
Expand Down Expand Up @@ -98,11 +97,10 @@ func FromEnv() NodeConfig {
config.AdvancerPollingInterval = GetAdvancerPollingInterval()
config.ValidatorPollingInterval = GetValidatorPollingInterval()
config.ClaimerPollingInterval = GetClaimerPollingInterval()
config.EspressoBaseUrl = GetBaseUrl()
config.EspressoBaseUrl = GetBaseUrl() + "/v0"
config.EspressoStartingBlock = GetStartingBlock()
config.EspressoNamespace = GetNamespace()
config.EspressoServiceEndpoint = GetServiceEndpoint()
config.MainSequencer = GetSequencer()
return config
}

Expand Down
10 changes: 0 additions & 10 deletions internal/config/generate/Config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -244,16 +244,6 @@ go-type = "string"
description = """
URL to Espresso nonce and submit service"""

#
# Sequencer
#

[sequencer.MAIN_SEQUENCER]
default = "espresso"
go-type = "string"
description = """
Main sequencer."""

#
# Temporary
#
Expand Down
12 changes: 0 additions & 12 deletions internal/config/generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cfb1a11

Please sign in to comment.