Skip to content

Commit

Permalink
chore: update protos and cometbft dep (#167)
Browse files Browse the repository at this point in the history 
- Switched to v1 protos which changes some protobuf shape names
- Upgraded cometbft version which had a vulnerability
- Updated to latest versions of astria codebase
  • Loading branch information
@joroshiba
joroshiba authored Oct 17, 2024
1 parent c0247ed commit c58fd61
Show file tree
Hide file tree
Showing 11 changed files with 299 additions and 206 deletions.
27 changes: 15 additions & 12 deletions modules/cli/cmd/devrunner/config/base.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,27 +40,30 @@ func DefaultBaseConfig(instanceName string) BaseConfig {
"astria_conductor_sequencer_requests_per_second": "500",
"astria_conductor_no_metrics": "true",
"astria_conductor_metrics_http_listener_addr": "127.0.0.1:9000",
"astria_conductor_expected_sequencer_chain_id": DefaultLocalNetworkName,
"astria_conductor_expected_celestia_chain_id": "",

// sequencer
"astria_sequencer_listen_addr": "127.0.0.1:26658",
"astria_sequencer_db_filepath": filepath.Join(homeDir, ".astria", instanceName, DataDirName, "astria_sequencer_db"),
"astria_sequencer_enable_mint": "false",
"astria_sequencer_grpc_addr": "127.0.0.1:8080",
"astria_sequencer_log": "astria_sequencer=info",
"astria_sequencer_no_otel": "true",
"astria_sequencer_force_stdout": "true",
"astria_sequencer_no_metrics": "true",
"astria_sequencer_metrics_http_listener_addr": "127.0.0.1:9000",
"astria_sequencer_pretty_print": "true",
"astria_sequencer_listen_addr": "127.0.0.1:26658",
"astria_sequencer_db_filepath": filepath.Join(homeDir, ".astria", instanceName, DataDirName, "astria_sequencer_db"),
"astria_sequencer_mempool_parked_max_tx_count": "200",
"astria_sequencer_grpc_addr": "127.0.0.1:8080",
"astria_sequencer_log": "astria_sequencer=info",
"astria_sequencer_no_otel": "true",
"astria_sequencer_force_stdout": "true",
"astria_sequencer_no_metrics": "true",
"astria_sequencer_metrics_http_listener_addr": "127.0.0.1:9000",
"astria_sequencer_pretty_print": "true",

// composer
"astria_composer_log": "astria_composer=info",
"astria_composer_no_otel": "true",
"astria_composer_force_stdout": "true",
"astria_composer_pretty_print": "true",
"astria_composer_api_listen_addr": "0.0.0.0:0",
"astria_composer_sequencer_url": "http://127.0.0.1:26657",
"astria_composer_sequencer_chain_id": "astria-dusk-" + cmd.DefaultDuskNum,
"astria_composer_sequencer_abci_endpoint": "http://127.0.0.1:26657",
"astria_composer_sequencer_grpc_endpoint": "http://127.0.0.1:8080",
"astria_composer_sequencer_chain_id": DefaultLocalNetworkName,
"astria_composer_rollups": "astriachain::ws://127.0.0.1:8546",
"astria_composer_private_key_file": filepath.Join(homeDir, ".astria", instanceName, DefaultConfigDirName, "composer_dev_priv_key"),
"astria_composer_sequencer_address_prefix": "astria",
Expand Down
6 changes: 3 additions & 3 deletions modules/cli/cmd/devrunner/config/constants.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const (

// NOTE - do not include the 'v' at the beginning of the version number
CometbftVersion = "0.38.8"
AstriaSequencerVersion = "0.16.0"
AstriaComposerVersion = "0.8.2"
AstriaConductorVersion = "0.20.0"
AstriaSequencerVersion = "1.0.0-rc.1"
AstriaComposerVersion = "1.0.0-rc.1"
AstriaConductorVersion = "1.0.0-rc.1"
)
66 changes: 51 additions & 15 deletions modules/cli/cmd/devrunner/config/genesis.json
View file
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": "astria_compat"
},
"accounts": [
{
Expand Down Expand Up @@ -83,26 +84,61 @@
"outbound_ics20_transfers_enabled": true
},
"fees": {
"transferBaseFee": {
"lo": "12"
"bridge_lock": {
"base": { "lo": 0 },
"multiplier": { "lo": 1 }
},
"sequenceBaseFee": {
"lo": "32"
"bridge_sudo_change": {
"base": { "lo": 24 },
"multiplier": { "lo": 0 }
},
"sequenceByteCostMultiplier": {
"lo": "1"
"bridge_unlock": {
"base": { "lo": 0 },
"multiplier": { "lo": 0 }
},
"initBridgeAccountBaseFee": {
"lo": "48"
"fee_asset_change": {
"base": { "lo": 0 },
"multiplier": { "lo": 0 }
},
"bridgeLockByteCostMultiplier": {
"lo": "1"
"fee_change": {
"base": { "lo": 0 },
"multiplier": { "lo": 0 }
},
"bridgeSudoChangeFee": {
"lo": "24"
"ibc_relay": {
"base": { "lo": 0 },
"multiplier": { "lo": 0 }
},
"ics20WithdrawalBaseFee": {
"lo": "24"
"ibc_relayer_change": {
"base": { "lo": 0 },
"multiplier": { "lo": 0 }
},
"ibc_sudo_change": {
"base": { "lo": 0 },
"multiplier": { "lo": 0 }
},
"ics20_withdrawal": {
"base": { "lo": 24 },
"multiplier": { "lo": 0 }
},
"init_bridge_account": {
"base": { "lo": 48 },
"multiplier": { "lo": 0 }
},
"rollup_data_submission": {
"base": { "lo": 32 },
"multiplier": { "lo": 1 }
},
"sudo_address_change": {
"base": { "lo": 0 },
"multiplier": { "lo": 0 }
},
"transfer": {
"base": { "lo": 12 },
"multiplier": { "lo": 0 }
},
"validator_update": {
"base": { "lo": 0 },
"multiplier": { "lo": 0 }
}
},
"native_asset_base_denomination": "nria",
Expand Down
6 changes: 4 additions & 2 deletions modules/cli/cmd/devrunner/config/networks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,12 @@ func (n NetworkConfig) GetEndpointOverrides(bc BaseConfig) []string {
match := re.FindString(rollupEndpoint)

return []string{
"ASTRIA_COMPOSER_SEQUENCER_CHAIN_ID=" + n.SequencerChainId,
"ASTRIA_CONDUCTOR_SEQUENCER_GRPC_URL=" + n.SequencerGRPC,
"ASTRIA_CONDUCTOR_SEQUENCER_COMETBFT_URL=" + n.SequencerRPC,
"ASTRIA_COMPOSER_SEQUENCER_URL=" + n.SequencerRPC,
"ASTRIA_CONDUCTOR_EXPECTED_SEQUENCER_CHAIN_ID" + "=" + n.SequencerChainId,
"ASTRIA_COMPOSER_SEQUENCER_CHAIN_ID=" + n.SequencerChainId,
"ASTRIA_COMPOSER_SEQUENCER_ABCI_ENDPOINT=" + n.SequencerRPC,
"ASTRIA_COMPOSER_SEQUENCER_GRPC_ENDPOINT=" + n.SequencerGRPC,
"ASTRIA_COMPOSER_ROLLUPS=" + n.RollupName + "::" + match,
}
}
32 changes: 18 additions & 14 deletions modules/cli/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module github.com/astriaorg/astria-cli-go/modules/cli
go 1.22.6

require (
buf.build/gen/go/astria/primitives/protocolbuffers/go v1.34.2-20240626163506-691883836b9e.2
buf.build/gen/go/astria/protocol-apis/protocolbuffers/go v1.34.2-20240627184145-2eaea785eb7d.2
buf.build/gen/go/astria/primitives/protocolbuffers/go v1.35.1-00000000000000-68c4cd4acb9f.1
buf.build/gen/go/astria/protocol-apis/protocolbuffers/go v1.35.1-00000000000000-42a0beedc983.1
github.com/99designs/keyring v1.2.2
github.com/astriaorg/astria-cli-go/modules/bech32m v0.0.0-00010101000000-000000000000
github.com/astriaorg/astria-cli-go/modules/go-sequencer-client v0.0.0-00010101000000-000000000000
Expand All @@ -19,6 +19,11 @@ require (
golang.org/x/crypto v0.26.0
)

require (
github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
)

replace github.com/astriaorg/astria-cli-go/modules/go-sequencer-client => ../go-sequencer-client

replace github.com/astriaorg/astria-cli-go/modules/bech32m => ../bech32m
Expand All @@ -30,18 +35,18 @@ require (
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
github.com/DataDog/zstd v1.5.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.3 // indirect
github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
github.com/btcsuite/btcd/btcutil v1.1.6 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cockroachdb/errors v1.11.3 // indirect
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/pebble v1.1.0 // indirect
github.com/cockroachdb/pebble v1.1.1 // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
github.com/cometbft/cometbft v0.38.9
github.com/cometbft/cometbft v0.38.12
github.com/cometbft/cometbft-db v0.12.0 // indirect
github.com/containerd/console v1.0.4 // indirect
github.com/cosmos/gogoproto v1.5.0 // indirect
github.com/cosmos/gogoproto v1.7.0 // indirect
github.com/danieljoos/wincred v1.2.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
Expand All @@ -65,15 +70,14 @@ require (
github.com/google/flatbuffers v24.3.25+incompatible // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/gookit/color v1.5.4 // indirect
github.com/gorilla/websocket v1.5.2 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jmhodges/levigo v1.0.0 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/linxGnu/grocksdb v1.9.1 // indirect
github.com/lithammer/fuzzysearch v1.1.8 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
Expand All @@ -85,9 +89,9 @@ require (
github.com/petermattis/goid v0.0.0-20240607163614-bb94eb51e7a7 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_golang v1.20.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.54.0 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
Expand All @@ -107,13 +111,13 @@ require (
go.opencensus.io v0.24.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240610135401-a8a62080eff3 // indirect
google.golang.org/grpc v1.64.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
google.golang.org/grpc v1.64.1 // indirect
google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit c58fd61

Please sign in to comment.