Chore: Update Service Binaries Config (#165)

* service bump * sequencer config updates * update cometbft genesis * update urls and chainId * add specific local/remote service versions. * refactor binaries info for dynamic download link creation * update fee asset * local versions match with default versions * bump dusk dawn nums, update sequencer config to match * single default target network * add build url funcs * try increase sleep to prevent ci tests failing * Revert "try increase sleep to prevent ci tests failing" This reverts commit d7fbaab. * specify local in ci test * denom and channel updates * add and update service versions * move binary url related stuff to own binaries.go file --------- Co-authored-by: Jesse Snyder <jessetsnyder@gmail.com>
astriaorg · Nov 1, 2024 · 76bd2c3 · 76bd2c3
1 parent ebf48a2
commit 76bd2c3
Show file tree

Hide file tree

Showing 25 changed files with 175 additions and 166 deletions.
diff --git a/.github/workflows/lint-and-test.yaml b/.github/workflows/lint-and-test.yaml
@@ -47,7 +47,7 @@ jobs:
         run: |
           # run dev runner and test-integration
           just run dev init
-          screen -d -m just run dev run
+          screen -d -m just run dev run --network local
           sleep 5
           just test-integration
 # FIXME - sequencer client tests are empty

diff --git a/modules/cli/README.md b/modules/cli/README.md
@@ -289,7 +289,7 @@ sequencer_chain_id = 'sequencer-only'
 sequencer_grpc = 'http://127.0.0.1:8080'
 sequencer_rpc = 'http://127.0.0.1:26657'
 rollup_name = 'astria-test-chain'
-default_denom = 'nria'
+default_denom = 'ntia'
 
 [networks.sequencer_only.services]
 [networks.sequencer_only.services.cometbft]

diff --git a/modules/cli/cmd/constants.go b/modules/cli/cmd/constants.go
@@ -1,6 +1,7 @@
 package cmd
 
 const (
-	DefaultDuskNum = "10"
-	DefaultDawnNum = "0"
+	DefaultDuskNum       = "11"
+	DefaultDawnNum       = "1"
+	DefaultTargetNetwork = "dawn"
 )
diff --git a/modules/cli/cmd/devrunner/config/base.go b/modules/cli/cmd/devrunner/config/base.go
@@ -73,7 +73,7 @@ func DefaultBaseConfig(instanceName string) BaseConfig {
 		"astria_composer_no_metrics":                 "true",
 		"astria_composer_metrics_http_listener_addr": "127.0.0.1:9000",
 		"astria_composer_grpc_addr":                  "0.0.0.0:0",
-		"astria_composer_fee_asset":                  "nria",
+		"astria_composer_fee_asset":                  "ntia",
 
 		// ANSI
 		"no_color": "",

diff --git a/modules/cli/cmd/devrunner/config/binaries.go b/modules/cli/cmd/devrunner/config/binaries.go
@@ -0,0 +1,36 @@
+package config
+
+// Url holds the parts of a URL that point to a release.
+type Url struct {
+	Prefix string
+	Middle string
+	Suffix string
+}
+
+// AvailableServiceReleaseUrls holds the parts of the release URLs for known services.
+type AvailableServiceReleaseUrls struct {
+	CometBFT        Url
+	AstriaSequencer Url
+	AstriaComposer  Url
+	AstriaConductor Url
+}
+
+// CometBftReleaseUrl returns the release URLs for the known CometBFT service.
+func (asru *AvailableServiceReleaseUrls) CometBftReleaseUrl(version string) string {
+	return asru.CometBFT.Prefix + version + asru.CometBFT.Middle + version + asru.CometBFT.Suffix
+}
+
+// AstriaSequencerReleaseUrl returns the release URLs for the known Astria Sequencer service.
+func (asru *AvailableServiceReleaseUrls) AstriaSequencerReleaseUrl(version string) string {
+	return asru.AstriaSequencer.Prefix + version + asru.AstriaSequencer.Suffix
+}
+
+// AstriaComposerReleaseUrl returns the release URLs for the known Astria Composer service.
+func (asru *AvailableServiceReleaseUrls) AstriaComposerReleaseUrl(version string) string {
+	return asru.AstriaComposer.Prefix + version + asru.AstriaComposer.Suffix
+}
+
+// AstriaConductorReleaseUrl returns the release URLs for the known Astria Conductor service.
+func (asru *AvailableServiceReleaseUrls) AstriaConductorReleaseUrl(version string) string {
+	return asru.AstriaConductor.Prefix + version + asru.AstriaConductor.Suffix
+}
diff --git a/modules/cli/cmd/devrunner/config/binaries_config_darwin_amd64.go b/modules/cli/cmd/devrunner/config/binaries_config_darwin_amd64.go
@@ -2,38 +2,25 @@
 
 package config
 
-type Binary struct {
-	Name    string
-	Version string
-	Url     string
-}
-
-type Binaries struct {
-	CometBFT        Binary
-	AstriaSequencer Binary
-	AstriaComposer  Binary
-	AstriaConductor Binary
-}
-
-var KnownBinaries = Binaries{
-	CometBFT: Binary{
-		Name:    "cometbft",
-		Version: "v" + CometbftVersion,
-		Url:     "https://github.com/cometbft/cometbft/releases/download/v" + CometbftVersion + "/cometbft_" + CometbftVersion + "_darwin_amd64.tar.gz",
+var ServiceUrls = AvailableServiceReleaseUrls{
+	CometBFT: Url{
+		Prefix: "https://github.com/cometbft/cometbft/releases/download/v",
+		Middle: "/cometbft_",
+		Suffix: "_darwin_amd64.tar.gz",
 	},
-	AstriaSequencer: Binary{
-		Name:    "astria-sequencer",
-		Version: "v" + AstriaSequencerVersion,
-		Url:     "https://github.com/astriaorg/astria/releases/download/sequencer-v" + AstriaSequencerVersion + "/astria-sequencer-x86_64-apple-darwin.tar.gz",
+	AstriaSequencer: Url{
+		Prefix: "https://github.com/astriaorg/astria/releases/download/sequencer-v",
+		Middle: "",
+		Suffix: "/astria-sequencer-x86_64-apple-darwin.tar.gz",
 	},
-	AstriaComposer: Binary{
-		Name:    "astria-composer",
-		Version: "v" + AstriaComposerVersion,
-		Url:     "https://github.com/astriaorg/astria/releases/download/composer-v" + AstriaComposerVersion + "/astria-composer-x86_64-apple-darwin.tar.gz",
+	AstriaComposer: Url{
+		Prefix: "https://github.com/astriaorg/astria/releases/download/composer-v",
+		Middle: "",
+		Suffix: "/astria-composer-x86_64-apple-darwin.tar.gz",
 	},
-	AstriaConductor: Binary{
-		Name:    "astria-conductor",
-		Version: "v" + AstriaConductorVersion,
-		Url:     "https://github.com/astriaorg/astria/releases/download/conductor-v" + AstriaConductorVersion + "/astria-conductor-x86_64-apple-darwin.tar.gz",
+	AstriaConductor: Url{
+		Prefix: "https://github.com/astriaorg/astria/releases/download/conductor-v",
+		Middle: "",
+		Suffix: "/astria-conductor-x86_64-apple-darwin.tar.gz",
 	},
 }
diff --git a/modules/cli/cmd/devrunner/config/binaries_config_darwin_arm64.go b/modules/cli/cmd/devrunner/config/binaries_config_darwin_arm64.go
@@ -2,38 +2,25 @@
 
 package config
 
-type Binary struct {
-	Name    string
-	Version string
-	Url     string
-}
-
-type Binaries struct {
-	CometBFT        Binary
-	AstriaSequencer Binary
-	AstriaComposer  Binary
-	AstriaConductor Binary
-}
-
-var KnownBinaries = Binaries{
-	CometBFT: Binary{
-		Name:    "cometbft",
-		Version: "v" + CometbftVersion,
-		Url:     "https://github.com/cometbft/cometbft/releases/download/v" + CometbftVersion + "/cometbft_" + CometbftVersion + "_darwin_arm64.tar.gz",
+var ServiceUrls = AvailableServiceReleaseUrls{
+	CometBFT: Url{
+		Prefix: "https://github.com/cometbft/cometbft/releases/download/v",
+		Middle: "/cometbft_",
+		Suffix: "_darwin_arm64.tar.gz",
 	},
-	AstriaSequencer: Binary{
-		Name:    "astria-sequencer",
-		Version: "v" + AstriaSequencerVersion,
-		Url:     "https://github.com/astriaorg/astria/releases/download/sequencer-v" + AstriaSequencerVersion + "/astria-sequencer-aarch64-apple-darwin.tar.gz",
+	AstriaSequencer: Url{
+		Prefix: "https://github.com/astriaorg/astria/releases/download/sequencer-v",
+		Middle: "",
+		Suffix: "/astria-sequencer-aarch64-apple-darwin.tar.gz",
 	},
-	AstriaComposer: Binary{
-		Name:    "astria-composer",
-		Version: "v" + AstriaComposerVersion,
-		Url:     "https://github.com/astriaorg/astria/releases/download/composer-v" + AstriaComposerVersion + "/astria-composer-aarch64-apple-darwin.tar.gz",
+	AstriaComposer: Url{
+		Prefix: "https://github.com/astriaorg/astria/releases/download/composer-v",
+		Middle: "",
+		Suffix: "/astria-composer-aarch64-apple-darwin.tar.gz",
 	},
-	AstriaConductor: Binary{
-		Name:    "astria-conductor",
-		Version: "v" + AstriaConductorVersion,
-		Url:     "https://github.com/astriaorg/astria/releases/download/conductor-v" + AstriaConductorVersion + "/astria-conductor-aarch64-apple-darwin.tar.gz",
+	AstriaConductor: Url{
+		Prefix: "https://github.com/astriaorg/astria/releases/download/conductor-v",
+		Middle: "",
+		Suffix: "/astria-conductor-aarch64-apple-darwin.tar.gz",
 	},
 }
diff --git a/modules/cli/cmd/devrunner/config/binaries_config_linux_amd64.go b/modules/cli/cmd/devrunner/config/binaries_config_linux_amd64.go
@@ -2,38 +2,25 @@
 
 package config
 
-type Binary struct {
-	Name    string
-	Version string
-	Url     string
-}
-
-type Binaries struct {
-	CometBFT        Binary
-	AstriaSequencer Binary
-	AstriaComposer  Binary
-	AstriaConductor Binary
-}
-
-var KnownBinaries = Binaries{
-	CometBFT: Binary{
-		Name:    "cometbft",
-		Version: "v" + CometbftVersion,
-		Url:     "https://github.com/cometbft/cometbft/releases/download/v" + CometbftVersion + "/cometbft_" + CometbftVersion + "_linux_amd64.tar.gz",
+var ServiceUrls = AvailableServiceReleaseUrls{
+	CometBFT: Url{
+		Prefix: "https://github.com/cometbft/cometbft/releases/download/v",
+		Middle: "/cometbft_",
+		Suffix: "_linux_amd64.tar.gz",
 	},
-	AstriaSequencer: Binary{
-		Name:    "astria-sequencer",
-		Version: "v" + AstriaSequencerVersion,
-		Url:     "https://github.com/astriaorg/astria/releases/download/sequencer-v" + AstriaSequencerVersion + "/astria-sequencer-x86_64-unknown-linux-gnu.tar.gz",
+	AstriaSequencer: Url{
+		Prefix: "https://github.com/astriaorg/astria/releases/download/sequencer-v",
+		Middle: "",
+		Suffix: "/astria-sequencer-x86_64-unknown-linux-gnu.tar.gz",
 	},
-	AstriaComposer: Binary{
-		Name:    "astria-composer",
-		Version: "v" + AstriaComposerVersion,
-		Url:     "https://github.com/astriaorg/astria/releases/download/composer-v" + AstriaComposerVersion + "/astria-composer-x86_64-unknown-linux-gnu.tar.gz",
+	AstriaComposer: Url{
+		Prefix: "https://github.com/astriaorg/astria/releases/download/composer-v",
+		Middle: "",
+		Suffix: "/astria-composer-x86_64-unknown-linux-gnu.tar.gz",
 	},
-	AstriaConductor: Binary{
-		Name:    "astria-conductor",
-		Version: "v" + AstriaConductorVersion,
-		Url:     "https://github.com/astriaorg/astria/releases/download/conductor-v" + AstriaConductorVersion + "/astria-conductor-x86_64-unknown-linux-gnu.tar.gz",
+	AstriaConductor: Url{
+		Prefix: "https://github.com/astriaorg/astria/releases/download/conductor-v",
+		Middle: "",
+		Suffix: "/astria-conductor-x86_64-unknown-linux-gnu.tar.gz",
 	},
 }
diff --git a/modules/cli/cmd/devrunner/config/constants.go b/modules/cli/cmd/devrunner/config/constants.go
@@ -12,15 +12,27 @@ const (
 	DefaultLocalNetworkName          = "sequencer-test-chain-0"
 	DefaultNetworksConfigName        = "networks-config.toml"
 	DefaultServiceLogLevel           = "info"
-	DefaultTargetNetwork             = "local"
 	DefaultLocalNativeDenom          = "ntia"
 	DefaultTUIConfigName             = "tui-config.toml"
 	DefaultHighlightColor            = "blue"
 	DefaultBorderColor               = "gray"
 
 	// NOTE - do not include the 'v' at the beginning of the version number
-	CometbftVersion        = "0.38.8"
-	AstriaSequencerVersion = "1.0.0-rc.1"
-	AstriaComposerVersion  = "1.0.0-rc.1"
-	AstriaConductorVersion = "1.0.0-rc.1"
+	// Service versions matched to live networks
+	MainnetCometbftVersion        = "0.38.11"
+	MainnetAstriaSequencerVersion = "1.0.0"
+	MainnetAstriaComposerVersion  = "1.0.0"
+	MainnetAstriaConductorVersion = "1.0.0"
+
+	// Testnet service versions
+	TestnetCometbftVersion  = "0.38.11"
+	TestnetSequencerVersion = "1.0.0-rc.2"
+	TestnetComposerVersion  = "1.0.0-rc.2"
+	TestnetConductorVersion = "1.0.0-rc.2"
+
+	// Devnet service versions
+	DevnetCometbftVersion  = "0.38.11"
+	DevnetSequencerVersion = "1.0.0-rc.2"
+	DevnetComposerVersion  = "1.0.0-rc.2"
+	DevnetConductorVersion = "1.0.0-rc.2"
 )
diff --git a/modules/cli/cmd/devrunner/config/genesis.json b/modules/cli/cmd/devrunner/config/genesis.json
@@ -141,9 +141,9 @@
         "multiplier": { "lo": 0 }
       }
     },
-    "native_asset_base_denomination": "nria",
+    "native_asset_base_denomination": "ntia",
     "allowed_fee_assets": [
-      "nria"
+      "ntia"
     ]
   }
 }