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

Jump to bottom

Chore: Service Bump #165

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Chore: Service Bump #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ca6dbfb
service bump
sambukowski Sep 6, 2024
43787e7
sequencer config updates
sambukowski Sep 6, 2024
2908613
update cometbft genesis
sambukowski Sep 6, 2024
2861059
update urls and chainId
sambukowski Sep 6, 2024
492864e
add specific local/remote service versions.
sambukowski Sep 6, 2024
0b96cf6
refactor binaries info for dynamic download link creation
sambukowski Sep 6, 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
34 changes: 17 additions & 17 deletions modules/cli/cmd/devrunner/config/binaries_config_darwin_amd64.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,37 @@
package config

type Binary struct {
Name string
Version string
Url string
UrlPrefix string
UrlMiddle string
UrlSuffix string
}

type Binaries struct {
type BinariesInfo struct {
CometBFT Binary
AstriaSequencer Binary
AstriaComposer Binary
AstriaConductor Binary
}

var KnownBinaries = Binaries{
var DownloadUrlParts = BinariesInfo{
CometBFT: Binary{
Name: "cometbft",
Version: "v" + CometbftVersion,
Url: "https://github.com/cometbft/cometbft/releases/download/v" + CometbftVersion + "/cometbft_" + CometbftVersion + "_darwin_amd64.tar.gz",
UrlPrefix: "https://github.com/cometbft/cometbft/releases/download/v",
UrlMiddle: "/cometbft_",
UrlSuffix: "_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",
UrlPrefix: "https://github.com/astriaorg/astria/releases/download/sequencer-v",
UrlMiddle: "",
UrlSuffix: "/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",
UrlPrefix: "https://github.com/astriaorg/astria/releases/download/composer-v",
UrlMiddle: "",
UrlSuffix: "/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",
UrlPrefix: "https://github.com/astriaorg/astria/releases/download/conductor-v",
UrlMiddle: "",
UrlSuffix: "/astria-conductor-x86_64-apple-darwin.tar.gz",
},
}
34 changes: 17 additions & 17 deletions modules/cli/cmd/devrunner/config/binaries_config_darwin_arm64.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,37 @@
package config

type Binary struct {
Name string
Version string
Url string
UrlPrefix string
UrlMiddle string
UrlSuffix string
}

type Binaries struct {
type BinariesInfo struct {
CometBFT Binary
AstriaSequencer Binary
AstriaComposer Binary
AstriaConductor Binary
}

var KnownBinaries = Binaries{
var DownloadUrlParts = BinariesInfo{
CometBFT: Binary{
Name: "cometbft",
Version: "v" + CometbftVersion,
Url: "https://github.com/cometbft/cometbft/releases/download/v" + CometbftVersion + "/cometbft_" + CometbftVersion + "_darwin_arm64.tar.gz",
UrlPrefix: "https://github.com/cometbft/cometbft/releases/download/v",
UrlMiddle: "/cometbft_",
UrlSuffix: "_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",
UrlPrefix: "https://github.com/astriaorg/astria/releases/download/sequencer-v",
UrlMiddle: "",
UrlSuffix: "/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",
UrlPrefix: "https://github.com/astriaorg/astria/releases/download/composer-v",
UrlMiddle: "",
UrlSuffix: "/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",
UrlPrefix: "https://github.com/astriaorg/astria/releases/download/conductor-v",
UrlMiddle: "",
UrlSuffix: "/astria-conductor-aarch64-apple-darwin.tar.gz",
},
}
34 changes: 17 additions & 17 deletions modules/cli/cmd/devrunner/config/binaries_config_linux_amd64.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,37 @@
package config

type Binary struct {
Name string
Version string
Url string
UrlPrefix string
UrlMiddle string
UrlSuffix string
}

type Binaries struct {
type BinariesInfo struct {
CometBFT Binary
AstriaSequencer Binary
AstriaComposer Binary
AstriaConductor Binary
}

var KnownBinaries = Binaries{
var DownloadUrlParts = BinariesInfo{
CometBFT: Binary{
Name: "cometbft",
Version: "v" + CometbftVersion,
Url: "https://github.com/cometbft/cometbft/releases/download/v" + CometbftVersion + "/cometbft_" + CometbftVersion + "_linux_amd64.tar.gz",
UrlPrefix: "https://github.com/cometbft/cometbft/releases/download/v",
UrlMiddle: "/cometbft_",
UrlSuffix: "_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",
UrlPrefix: "https://github.com/astriaorg/astria/releases/download/sequencer-v",
UrlMiddle: "",
UrlSuffix: "/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",
UrlPrefix: "https://github.com/astriaorg/astria/releases/download/composer-v",
UrlMiddle: "",
UrlSuffix: "/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",
UrlPrefix: "https://github.com/astriaorg/astria/releases/download/conductor-v",
UrlMiddle: "",
UrlSuffix: "/astria-conductor-x86_64-unknown-linux-gnu.tar.gz",
},
}
4 changes: 4 additions & 0 deletions modules/cli/cmd/devrunner/config/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,8 @@ const (
AstriaSequencerVersion = "0.16.0"
AstriaComposerVersion = "0.8.2"
AstriaConductorVersion = "0.20.0"

LocalSequencerVersion = "0.17.0"
LocalComposerVersion = "0.8.3"
LocalConductorVersion = "0.20.1"
)
3 changes: 2 additions & 1 deletion modules/cli/cmd/devrunner/config/genesis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
"app_hash": "",
"app_state": {
"address_prefixes": {
"base": "astria"
"base": "astria",
"ibcCompat": "astriacompat"
},
"accounts": [
{
Expand Down
36 changes: 18 additions & 18 deletions modules/cli/cmd/devrunner/config/networks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,29 +50,29 @@ func DefaultNetworksConfigs(defaultBinDir string) NetworkConfigs {
Services: map[string]ServiceConfig{
"conductor": {
Name: "astria-conductor",
Version: "v" + AstriaConductorVersion,
DownloadURL: KnownBinaries.AstriaConductor.Url,
LocalPath: filepath.Join(defaultBinDir, "astria-conductor-v"+AstriaConductorVersion),
Version: "v" + LocalConductorVersion,
DownloadURL: DownloadUrlParts.AstriaConductor.UrlPrefix + LocalConductorVersion + DownloadUrlParts.AstriaConductor.UrlSuffix,
LocalPath: filepath.Join(defaultBinDir, "astria-conductor-v"+LocalConductorVersion),
Args: nil,
},
"composer": {
Name: "astria-composer",
Version: "v" + AstriaComposerVersion,
DownloadURL: KnownBinaries.AstriaComposer.Url,
LocalPath: filepath.Join(defaultBinDir, "astria-composer-v"+AstriaComposerVersion),
Version: "v" + LocalComposerVersion,
DownloadURL: DownloadUrlParts.AstriaComposer.UrlPrefix + LocalComposerVersion + DownloadUrlParts.AstriaComposer.UrlSuffix,
LocalPath: filepath.Join(defaultBinDir, "astria-composer-v"+LocalComposerVersion),
Args: nil,
},
"sequencer": {
Name: "astria-sequencer",
Version: "v" + AstriaSequencerVersion,
DownloadURL: KnownBinaries.AstriaSequencer.Url,
LocalPath: filepath.Join(defaultBinDir, "astria-sequencer-v"+AstriaSequencerVersion),
Version: "v" + LocalSequencerVersion,
DownloadURL: DownloadUrlParts.AstriaSequencer.UrlPrefix + LocalSequencerVersion + DownloadUrlParts.AstriaSequencer.UrlSuffix,
LocalPath: filepath.Join(defaultBinDir, "astria-sequencer-v"+LocalSequencerVersion),
Args: nil,
},
"cometbft": {
Name: "cometbft",
Version: "v" + CometbftVersion,
DownloadURL: KnownBinaries.CometBFT.Url,
DownloadURL: DownloadUrlParts.CometBFT.UrlPrefix + CometbftVersion + DownloadUrlParts.CometBFT.UrlMiddle + CometbftVersion + DownloadUrlParts.CometBFT.UrlSuffix,
LocalPath: filepath.Join(defaultBinDir, "cometbft-v"+CometbftVersion),
Args: nil,
},
Expand All @@ -88,37 +88,37 @@ func DefaultNetworksConfigs(defaultBinDir string) NetworkConfigs {
"conductor": {
Name: "astria-conductor",
Version: "v" + AstriaConductorVersion,
DownloadURL: KnownBinaries.AstriaConductor.Url,
DownloadURL: DownloadUrlParts.AstriaConductor.UrlPrefix + AstriaConductorVersion + DownloadUrlParts.AstriaConductor.UrlSuffix,
LocalPath: filepath.Join(defaultBinDir, "astria-conductor-v"+AstriaConductorVersion),
Args: nil,
},
"composer": {
Name: "astria-composer",
Version: "v" + AstriaComposerVersion,
DownloadURL: KnownBinaries.AstriaComposer.Url,
DownloadURL: DownloadUrlParts.AstriaComposer.UrlPrefix + AstriaComposerVersion + DownloadUrlParts.AstriaComposer.UrlSuffix,
LocalPath: filepath.Join(defaultBinDir, "astria-composer-v"+AstriaComposerVersion),
Args: nil,
},
},
},
"dawn": {
SequencerChainId: "astria-dawn-" + cmd.DefaultDawnNum,
SequencerGRPC: "https://grpc.sequencer.dawn-" + cmd.DefaultDawnNum + ".devnet.astria.org/",
SequencerRPC: "https://rpc.sequencer.dawn-" + cmd.DefaultDawnNum + ".devnet.astria.org/",
SequencerGRPC: "https://grpc.sequencer.dawn-" + cmd.DefaultDawnNum + ".astria.org/",
SequencerRPC: "https://rpc.sequencer.dawn-" + cmd.DefaultDawnNum + ".astria.org/",
RollupName: "",
NativeDenom: "ibc/channel0/utia",
Services: map[string]ServiceConfig{
"conductor": {
Name: "astria-conductor",
Version: "v" + AstriaConductorVersion,
DownloadURL: KnownBinaries.AstriaConductor.Url,
DownloadURL: DownloadUrlParts.AstriaConductor.UrlPrefix + AstriaConductorVersion + DownloadUrlParts.AstriaConductor.UrlSuffix,
LocalPath: filepath.Join(defaultBinDir, "astria-conductor-v"+AstriaConductorVersion),
Args: nil,
},
"composer": {
Name: "astria-composer",
Version: "v" + AstriaComposerVersion,
DownloadURL: KnownBinaries.AstriaComposer.Url,
DownloadURL: DownloadUrlParts.AstriaComposer.UrlPrefix + AstriaComposerVersion + DownloadUrlParts.AstriaComposer.UrlSuffix,
LocalPath: filepath.Join(defaultBinDir, "astria-composer-v"+AstriaComposerVersion),
Args: nil,
},
Expand All @@ -134,14 +134,14 @@ func DefaultNetworksConfigs(defaultBinDir string) NetworkConfigs {
"conductor": {
Name: "astria-conductor",
Version: "v" + AstriaConductorVersion,
DownloadURL: KnownBinaries.AstriaConductor.Url,
DownloadURL: DownloadUrlParts.AstriaConductor.UrlPrefix + AstriaConductorVersion + DownloadUrlParts.AstriaConductor.UrlSuffix,
LocalPath: filepath.Join(defaultBinDir, "astria-conductor-v"+AstriaConductorVersion),
Args: nil,
},
"composer": {
Name: "astria-composer",
Version: "v" + AstriaComposerVersion,
DownloadURL: KnownBinaries.AstriaComposer.Url,
DownloadURL: DownloadUrlParts.AstriaComposer.UrlPrefix + AstriaComposerVersion + DownloadUrlParts.AstriaComposer.UrlSuffix,
LocalPath: filepath.Join(defaultBinDir, "astria-composer-v"+AstriaComposerVersion),
Args: nil,
},
Expand Down
8 changes: 4 additions & 4 deletions modules/cli/cmd/sequencer/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ func GetSequencerNetworkConfigsPresets() NetworkConfigs {
FeeAsset: "nria",
},
"dusk": {
SequencerChainId: DefaultSequencerChainID,
SequencerURL: DefaultSequencerURL,
SequencerChainId: "astria-dusk-" + cmd.DefaultDuskNum,
SequencerURL: "https://rpc.sequencer.astria-dusk-" + cmd.DefaultDuskNum + ".devnet.astria.org",
Asset: "nria",
FeeAsset: "nria",
},
"dawn": {
SequencerChainId: "astria-dawn-0",
SequencerURL: "https://rpc.sequencer.dawn-0.devnet.astria.org",
SequencerChainId: DefaultSequencerChainID,
SequencerURL: DefaultSequencerURL,
Asset: "ibc/channel0/utia",
FeeAsset: "ibc/channel0/utia",
},
Expand Down
4 changes: 2 additions & 2 deletions modules/cli/cmd/sequencer/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
const (
DefaultConfigDirName = ".astria"
DefaultAddressPrefix = "astria"
DefaultSequencerURL = "https://rpc.sequencer.dusk-" + cmd.DefaultDuskNum + ".devnet.astria.org"
DefaultSequencerChainID = "astria-dusk-" + cmd.DefaultDuskNum
DefaultSequencerURL = "https://rpc.sequencer.dawn-" + cmd.DefaultDawnNum + ".astria.org"
DefaultSequencerChainID = "dawn-" + cmd.DefaultDawnNum
DefaultAsset = "ntia"
DefaultFeeAsset = "ntia"
DefaultSequencerNetworksConfigFilename = "sequencer-networks-config.toml"
Expand Down
Loading