diff --git a/cmd/config/init/genesis.go b/cmd/config/init/genesis.go index 76fbe6ab..835b020b 100644 --- a/cmd/config/init/genesis.go +++ b/cmd/config/init/genesis.go @@ -4,6 +4,7 @@ import ( "fmt" "math/big" "os" + "strconv" "strings" "github.com/dymensionxyz/roller/cmd/consts" @@ -16,6 +17,10 @@ import ( "github.com/tidwall/sjson" ) +const ( + totalSupplyToStakingRatio = 2 +) + func initializeRollappGenesis(initConfig config.RollappConfig) error { totalTokenSupply, success := new(big.Int).SetString(initConfig.TokenSupply, 10) if !success { @@ -44,6 +49,10 @@ func initializeRollappGenesis(initConfig config.RollappConfig) error { if err != nil { return err } + err = generateGenesisTx(initConfig) + if err != nil { + return err + } err = updateGenesisParams(GetGenesisFilePath(initConfig.Home), initConfig.Denom, initConfig.Decimals) if err != nil { return err @@ -139,3 +148,42 @@ func updateGenesisParams(genesisFilePath string, denom string, decimals uint) er params := getDefaultGenesisParams(denom, decimals) return UpdateJSONParams(genesisFilePath, params) } + +func generateGenesisTx(initConfig config.RollappConfig) error { + err := registerSequencerAsGoverner(initConfig) + if err != nil { + return err + } + // collect gentx + rollappConfigDirPath := filepath.Join(initConfig.Home, consts.ConfigDirName.Rollapp) + collectGentx := exec.Command(initConfig.RollappBinary, "collect-gentxs", "--home", rollappConfigDirPath) + _, err = utils.ExecBashCommandWithStdout(collectGentx) + if err != nil { + return err + } + return nil + +} + +// registerSequencerAsGoverner registers the sequencer as a governor of the rollapp chain. +// currently it sets the staking amount to half of the total token supply. +// TODO: make the staking amount configurable +func registerSequencerAsGoverner(initConfig config.RollappConfig) error { + totalSupply, err := strconv.Atoi(initConfig.TokenSupply) + if err != nil { + return fmt.Errorf("Error converting string to integer: %w", err) + } + // Convert to token supply with decimals + stakedSupply := big.NewInt(int64(totalSupply / totalSupplyToStakingRatio)) + multiplier := new(big.Int).Exp(big.NewInt(10), big.NewInt(int64(initConfig.Decimals)), nil) + stakedSupply.Mul(stakedSupply, multiplier) + // Build and run the gentx command + rollappConfigDirPath := filepath.Join(initConfig.Home, consts.ConfigDirName.Rollapp) + gentxCmd := exec.Command(initConfig.RollappBinary, "gentx", consts.KeysIds.RollappSequencer, + fmt.Sprint(stakedSupply, initConfig.Denom), "--chain-id", initConfig.RollappID, "--keyring-backend", "test", "--home", rollappConfigDirPath) + _, err = utils.ExecBashCommandWithStdout(gentxCmd) + if err != nil { + return err + } + return nil +} diff --git a/cmd/config/init/rollapp.go b/cmd/config/init/rollapp.go index 672b2812..abffc7f2 100644 --- a/cmd/config/init/rollapp.go +++ b/cmd/config/init/rollapp.go @@ -1,10 +1,11 @@ package initconfig import ( - "github.com/dymensionxyz/roller/sequencer" "os/exec" "path/filepath" + "github.com/dymensionxyz/roller/sequencer" + "github.com/dymensionxyz/roller/cmd/utils" "github.com/dymensionxyz/roller/config" @@ -23,9 +24,9 @@ func initializeRollappConfig(initConfig config.RollappConfig) error { if err != nil { return err } - setGentxCmd := exec.Command(initConfig.RollappBinary, "gentx_seq", + gentxSeqCmd := exec.Command(initConfig.RollappBinary, "gentx_seq", "--pubkey", seqPubKey, "--from", consts.KeysIds.RollappSequencer, "--keyring-backend", "test", "--home", home) - _, err = utils.ExecBashCommandWithStdout(setGentxCmd) + _, err = utils.ExecBashCommandWithStdout(gentxSeqCmd) if err != nil { return err } diff --git a/test/config/init/goldens/init_with_flags/rollapp/config/config.toml b/test/config/init/goldens/init_with_flags/rollapp/config/config.toml index 310cb76d..1613e413 100644 --- a/test/config/init/goldens/init_with_flags/rollapp/config/config.toml +++ b/test/config/init/goldens/init_with_flags/rollapp/config/config.toml @@ -1,115 +1,471 @@ -abci = "socket" +# This is a TOML config file. +# For more information, see https://github.com/toml-lang/toml + +# NOTE: Any path below can be absolute (e.g. "/var/myawesomeapp/data") or +# relative to the home directory (e.g. "data"). The home directory is +# "$HOME/.cometbft" by default, but could be changed via $CMTHOME env variable +# or --home cmd flag. + +####################################################################### +### Main Base Config Options ### +####################################################################### + +# TCP or UNIX socket address of the ABCI application, +# or the name of an ABCI application compiled in with the CometBFT binary +proxy_app = "tcp://127.0.0.1:26658" + +# A custom human readable name for this node +moniker = "hub_sequencer" + +# If this node is many blocks behind the tip of the chain, FastSync +# allows them to catchup quickly by downloading blocks in parallel +# and verifying their commits +fast_sync = true + +# Database backend: goleveldb | cleveldb | boltdb | rocksdb | badgerdb +# * goleveldb (github.com/syndtr/goleveldb - most popular implementation) +# - pure go +# - stable +# * cleveldb (uses levigo wrapper) +# - fast +# - requires gcc +# - use cleveldb build tag (go build -tags cleveldb) +# * boltdb (uses etcd's fork of bolt - github.com/etcd-io/bbolt) +# - EXPERIMENTAL +# - may be faster is some use-cases (random reads - indexer) +# - use boltdb build tag (go build -tags boltdb) +# * rocksdb (uses github.com/tecbot/gorocksdb) +# - EXPERIMENTAL +# - requires gcc +# - use rocksdb build tag (go build -tags rocksdb) +# * badgerdb (uses github.com/dgraph-io/badger) +# - EXPERIMENTAL +# - use badgerdb build tag (go build -tags badgerdb) db_backend = "goleveldb" + +# Database directory db_dir = "data" -fast_sync = true -filter_peers = false -genesis_file = "config/genesis.json" -log_format = "plain" + +# Output level for logging, including package level options log_level = "debug" -moniker = "hub_sequencer" -node_key_file = "config/node_key.json" + +# Output format: 'plain' (colored text) or 'json' +log_format = "plain" + +##### additional base config options ##### + +# Path to the JSON file containing the initial validator set and other meta data +genesis_file = "config/genesis.json" + +# Path to the JSON file containing the private key to use as a validator in the consensus protocol priv_validator_key_file = "config/priv_validator_key.json" -priv_validator_laddr = "" + +# Path to the JSON file containing the last sign state of a validator priv_validator_state_file = "data/priv_validator_state.json" -proxy_app = "tcp://127.0.0.1:26658" -[consensus] - create_empty_blocks = true - create_empty_blocks_interval = "0s" - double_sign_check_height = 0 - peer_gossip_sleep_duration = "100ms" - peer_query_maj23_sleep_duration = "2s" - skip_timeout_commit = false - timeout_commit = "5s" - timeout_precommit = "1s" - timeout_precommit_delta = "500ms" - timeout_prevote = "1s" - timeout_prevote_delta = "500ms" - timeout_propose = "3s" - timeout_propose_delta = "500ms" - wal_file = "data/cs.wal/wal" +# TCP or UNIX socket address for CometBFT to listen on for +# connections from an external PrivValidator process +priv_validator_laddr = "" -[fastsync] - version = "v0" +# Path to the JSON file containing the private key to use for node authentication in the p2p protocol +node_key_file = "config/node_key.json" -[instrumentation] - max_open_connections = 3 - namespace = "cometbft" - prometheus = false - prometheus_listen_addr = ":26660" +# Mechanism to connect to the ABCI application: socket | grpc +abci = "socket" -[mempool] - broadcast = true - cache_size = 10000 - keep-invalid-txs-in-cache = false - max_batch_bytes = 0 - max_tx_bytes = 1048576 - max_txs_bytes = 1073741824 - recheck = true - size = 5000 - ttl-duration = "0s" - ttl-num-blocks = 0 - version = "v0" - wal_dir = "" +# If true, query the ABCI app on connecting to a new peer +# so the app can decide if we should keep the connection or not +filter_peers = false -[p2p] - addr_book_file = "config/addrbook.json" - addr_book_strict = true - allow_duplicate_ip = false - dial_timeout = "3s" - external_address = "" - flush_throttle_timeout = "100ms" - handshake_timeout = "20s" - laddr = "tcp://0.0.0.0:26656" - max_num_inbound_peers = 40 - max_num_outbound_peers = 10 - max_packet_msg_payload_size = 1024 - persistent_peers = "" - persistent_peers_max_dial_period = "0s" - pex = true - private_peer_ids = "" - recv_rate = 5120000 - seed_mode = false - seeds = "" - send_rate = 5120000 - unconditional_peer_ids = "" - upnp = false +####################################################################### +### Advanced Configuration Options ### +####################################################################### + +####################################################### +### RPC Server Configuration Options ### +####################################################### [rpc] - cors_allowed_headers = ["Origin", "Accept", "Content-Type", "X-Requested-With", "X-Server-Time"] - cors_allowed_methods = ["HEAD", "GET", "POST"] - cors_allowed_origins = ["*"] - experimental_close_on_slow_client = false - experimental_subscription_buffer_size = 200 - experimental_websocket_write_buffer_size = 200 - grpc_laddr = "" - grpc_max_open_connections = 900 - laddr = "tcp://0.0.0.0:26657" - max_body_bytes = 1000000 - max_header_bytes = 1048576 - max_open_connections = 900 - max_subscription_clients = 100 - max_subscriptions_per_client = 5 - pprof_laddr = "localhost:6060" - timeout_broadcast_tx_commit = "10s" - tls_cert_file = "" - tls_key_file = "" - unsafe = false +# TCP or UNIX socket address for the RPC server to listen on +laddr = "tcp://0.0.0.0:26657" + +# A list of origins a cross-domain request can be executed from +# Default value '[]' disables cors support +# Use '["*"]' to allow any origin +cors_allowed_origins = ["*", ] + +# A list of methods the client is allowed to use with cross-domain requests +cors_allowed_methods = ["HEAD", "GET", "POST", ] + +# A list of non simple headers the client is allowed to use with cross-domain requests +cors_allowed_headers = ["Origin", "Accept", "Content-Type", "X-Requested-With", "X-Server-Time", ] + +# TCP or UNIX socket address for the gRPC server to listen on +# NOTE: This server only supports /broadcast_tx_commit +grpc_laddr = "" + +# Maximum number of simultaneous connections. +# Does not include RPC (HTTP&WebSocket) connections. See max_open_connections +# If you want to accept a larger number than the default, make sure +# you increase your OS limits. +# 0 - unlimited. +# Should be < {ulimit -Sn} - {MaxNumInboundPeers} - {MaxNumOutboundPeers} - {N of wal, db and other open files} +# 1024 - 40 - 10 - 50 = 924 = ~900 +grpc_max_open_connections = 900 + +# Activate unsafe RPC commands like /dial_seeds and /unsafe_flush_mempool +unsafe = false + +# Maximum number of simultaneous connections (including WebSocket). +# Does not include gRPC connections. See grpc_max_open_connections +# If you want to accept a larger number than the default, make sure +# you increase your OS limits. +# 0 - unlimited. +# Should be < {ulimit -Sn} - {MaxNumInboundPeers} - {MaxNumOutboundPeers} - {N of wal, db and other open files} +# 1024 - 40 - 10 - 50 = 924 = ~900 +max_open_connections = 900 + +# Maximum number of unique clientIDs that can /subscribe +# If you're using /broadcast_tx_commit, set to the estimated maximum number +# of broadcast_tx_commit calls per block. +max_subscription_clients = 100 + +# Maximum number of unique queries a given client can /subscribe to +# If you're using GRPC (or Local RPC client) and /broadcast_tx_commit, set to +# the estimated # maximum number of broadcast_tx_commit calls per block. +max_subscriptions_per_client = 5 + +# Experimental parameter to specify the maximum number of events a node will +# buffer, per subscription, before returning an error and closing the +# subscription. Must be set to at least 100, but higher values will accommodate +# higher event throughput rates (and will use more memory). +experimental_subscription_buffer_size = 200 + +# Experimental parameter to specify the maximum number of RPC responses that +# can be buffered per WebSocket client. If clients cannot read from the +# WebSocket endpoint fast enough, they will be disconnected, so increasing this +# parameter may reduce the chances of them being disconnected (but will cause +# the node to use more memory). +# +# Must be at least the same as "experimental_subscription_buffer_size", +# otherwise connections could be dropped unnecessarily. This value should +# ideally be somewhat higher than "experimental_subscription_buffer_size" to +# accommodate non-subscription-related RPC responses. +experimental_websocket_write_buffer_size = 200 + +# If a WebSocket client cannot read fast enough, at present we may +# silently drop events instead of generating an error or disconnecting the +# client. +# +# Enabling this experimental parameter will cause the WebSocket connection to +# be closed instead if it cannot read fast enough, allowing for greater +# predictability in subscription behaviour. +experimental_close_on_slow_client = false + +# How long to wait for a tx to be committed during /broadcast_tx_commit. +# WARNING: Using a value larger than 10s will result in increasing the +# global HTTP write timeout, which applies to all connections and endpoints. +# See https://github.com/tendermint/tendermint/issues/3435 +timeout_broadcast_tx_commit = "10s" + +# Maximum size of request body, in bytes +max_body_bytes = 1000000 + +# Maximum size of request header, in bytes +max_header_bytes = 1048576 + +# The path to a file containing certificate that is used to create the HTTPS server. +# Might be either absolute path or path related to CometBFT's config directory. +# If the certificate is signed by a certificate authority, +# the certFile should be the concatenation of the server's certificate, any intermediates, +# and the CA's certificate. +# NOTE: both tls_cert_file and tls_key_file must be present for CometBFT to create HTTPS server. +# Otherwise, HTTP server is run. +tls_cert_file = "" + +# The path to a file containing matching private key that is used to create the HTTPS server. +# Might be either absolute path or path related to CometBFT's config directory. +# NOTE: both tls-cert-file and tls-key-file must be present for CometBFT to create HTTPS server. +# Otherwise, HTTP server is run. +tls_key_file = "" + +# pprof listen address (https://golang.org/pkg/net/http/pprof) +pprof_laddr = "localhost:6060" + +####################################################### +### P2P Configuration Options ### +####################################################### +[p2p] + +# Address to listen for incoming connections +laddr = "tcp://0.0.0.0:26656" + +# Address to advertise to peers for them to dial +# If empty, will use the same port as the laddr, +# and will introspect on the listener or use UPnP +# to figure out the address. ip and port are required +# example: 159.89.10.97:26656 +external_address = "" + +# Comma separated list of seed nodes to connect to +seeds = "" + +# Comma separated list of nodes to keep persistent connections to +persistent_peers = "" + +# UPNP port forwarding +upnp = false + +# Path to address book +addr_book_file = "config/addrbook.json" + +# Set true for strict address routability rules +# Set false for private or local networks +addr_book_strict = true + +# Maximum number of inbound peers +max_num_inbound_peers = 40 + +# Maximum number of outbound peers to connect to, excluding persistent peers +max_num_outbound_peers = 10 + +# List of node IDs, to which a connection will be (re)established ignoring any existing limits +unconditional_peer_ids = "" + +# Maximum pause when redialing a persistent peer (if zero, exponential backoff is used) +persistent_peers_max_dial_period = "0s" + +# Time to wait before flushing messages out on the connection +flush_throttle_timeout = "100ms" + +# Maximum size of a message packet payload, in bytes +max_packet_msg_payload_size = 1024 + +# Rate at which packets can be sent, in bytes/second +send_rate = 5120000 + +# Rate at which packets can be received, in bytes/second +recv_rate = 5120000 + +# Set true to enable the peer-exchange reactor +pex = true + +# Seed mode, in which node constantly crawls the network and looks for +# peers. If another node asks it for addresses, it responds and disconnects. +# +# Does not work if the peer-exchange reactor is disabled. +seed_mode = false + +# Comma separated list of peer IDs to keep private (will not be gossiped to other peers) +private_peer_ids = "" + +# Toggle to disable guard against peers connecting from the same ip. +allow_duplicate_ip = false + +# Peer connection configuration. +handshake_timeout = "20s" +dial_timeout = "3s" + +####################################################### +### Mempool Configuration Option ### +####################################################### +[mempool] + +# Mempool version to use: +# 1) "v0" - (default) FIFO mempool. +# 2) "v1" - prioritized mempool. +version = "v0" + +# Recheck (default: true) defines whether CometBFT should recheck the +# validity for all remaining transaction in the mempool after a block. +# Since a block affects the application state, some transactions in the +# mempool may become invalid. If this does not apply to your application, +# you can disable rechecking. +recheck = true +broadcast = true +wal_dir = "" + +# Maximum number of transactions in the mempool +size = 5000 + +# Limit the total size of all txs in the mempool. +# This only accounts for raw transactions (e.g. given 1MB transactions and +# max_txs_bytes=5MB, mempool will only accept 5 transactions). +max_txs_bytes = 1073741824 + +# Size of the cache (used to filter transactions we saw earlier) in transactions +cache_size = 10000 + +# Do not remove invalid transactions from the cache (default: false) +# Set to true if it's not possible for any invalid transaction to become valid +# again in the future. +keep-invalid-txs-in-cache = false + +# Maximum size of a single transaction. +# NOTE: the max size of a tx transmitted over the network is {max_tx_bytes}. +max_tx_bytes = 1048576 + +# Maximum size of a batch of transactions to send to a peer +# Including space needed by encoding (one varint per transaction). +# XXX: Unused due to https://github.com/tendermint/tendermint/issues/5796 +max_batch_bytes = 0 + +# ttl-duration, if non-zero, defines the maximum amount of time a transaction +# can exist for in the mempool. +# +# Note, if ttl-num-blocks is also defined, a transaction will be removed if it +# has existed in the mempool at least ttl-num-blocks number of blocks or if it's +# insertion time into the mempool is beyond ttl-duration. +ttl-duration = "0s" + +# ttl-num-blocks, if non-zero, defines the maximum number of blocks a transaction +# can exist for in the mempool. +# +# Note, if ttl-duration is also defined, a transaction will be removed if it +# has existed in the mempool at least ttl-num-blocks number of blocks or if +# it's insertion time into the mempool is beyond ttl-duration. +ttl-num-blocks = 0 + +####################################################### +### State Sync Configuration Options ### +####################################################### [statesync] - chunk_fetchers = "4" - chunk_request_timeout = "10s" - discovery_time = "15s" - enable = false - rpc_servers = "" - temp_dir = "" - trust_hash = "" - trust_height = 0 - trust_period = "168h0m0s" +# State sync rapidly bootstraps a new node by discovering, fetching, and restoring a state machine +# snapshot from peers instead of fetching and replaying historical blocks. Requires some peers in +# the network to take and serve state machine snapshots. State sync is not attempted if the node +# has any local state (LastBlockHeight > 0). The node will have a truncated block history, +# starting from the height of the snapshot. +enable = false + +# RPC servers (comma-separated) for light client verification of the synced state machine and +# retrieval of state data for node bootstrapping. Also needs a trusted height and corresponding +# header hash obtained from a trusted source, and a period during which validators can be trusted. +# +# For Cosmos SDK-based chains, trust_period should usually be about 2/3 of the unbonding time (~2 +# weeks) during which they can be financially punished (slashed) for misbehavior. +rpc_servers = "" +trust_height = 0 +trust_hash = "" +trust_period = "168h0m0s" + +# Time to spend discovering snapshots before initiating a restore. +discovery_time = "15s" + +# Temporary directory for state sync snapshot chunks, defaults to the OS tempdir (typically /tmp). +# Will create a new, randomly named directory within, and remove it when done. +temp_dir = "" + +# The timeout duration before re-requesting a chunk, possibly from a different +# peer (default: 1 minute). +chunk_request_timeout = "10s" + +# The number of concurrent chunk fetchers to run (default: 1). +chunk_fetchers = "4" + +####################################################### +### Fast Sync Configuration Connections ### +####################################################### +[fastsync] + +# Fast Sync version to use: +# 1) "v0" (default) - the legacy fast sync implementation +# 2) "v1" - refactor of v0 version for better testability +# 2) "v2" - complete redesign of v0, optimized for testability & readability +version = "v0" + +####################################################### +### Consensus Configuration Options ### +####################################################### +[consensus] + +wal_file = "data/cs.wal/wal" +# How long we wait for a proposal block before prevoting nil +timeout_propose = "3s" +# How much timeout_propose increases with each round +timeout_propose_delta = "500ms" +# How long we wait after receiving +2/3 prevotes for “anything” (ie. not a single block or nil) +timeout_prevote = "1s" +# How much the timeout_prevote increases with each round +timeout_prevote_delta = "500ms" +# How long we wait after receiving +2/3 precommits for “anything” (ie. not a single block or nil) +timeout_precommit = "1s" +# How much the timeout_precommit increases with each round +timeout_precommit_delta = "500ms" +# How long we wait after committing a block, before starting on the new +# height (this gives us a chance to receive some more precommits, even +# though we already have +2/3). +timeout_commit = "5s" + +# How many blocks to look back to check existence of the node's consensus votes before joining consensus +# When non-zero, the node will panic upon restart +# if the same consensus key was used to sign {double_sign_check_height} last blocks. +# So, validators should stop the state machine, wait for some blocks, and then restart the state machine to avoid panic. +double_sign_check_height = 0 + +# Make progress as soon as we have all the precommits (as if TimeoutCommit = 0) +skip_timeout_commit = false + +# EmptyBlocks mode and possible interval between empty blocks +create_empty_blocks = true +create_empty_blocks_interval = "0s" + +# Reactor sleep duration parameters +peer_gossip_sleep_duration = "100ms" +peer_query_maj23_sleep_duration = "2s" + +####################################################### +### Storage Configuration Options ### +####################################################### [storage] - discard_abci_responses = false +# Set to true to discard ABCI responses from the state store, which can save a +# considerable amount of disk space. Set to false to ensure ABCI responses are +# persisted. ABCI responses are required for /block_results RPC queries, and to +# reindex events in the command-line tool. +discard_abci_responses = false + +####################################################### +### Transaction Indexer Configuration Options ### +####################################################### [tx_index] - indexer = "kv" - psql-conn = "" + +# What indexer to use for transactions +# +# The application will set which txs to index. In some cases a node operator will be able +# to decide which txs to index based on configuration set in the application. +# +# Options: +# 1) "null" +# 2) "kv" (default) - the simplest possible indexer, backed by key-value storage (defaults to levelDB; see DBBackend). +# - When "kv" is chosen "tx.height" and "tx.hash" will always be indexed. +# 3) "psql" - the indexer services backed by PostgreSQL. +# When "kv" or "psql" is chosen "tx.height" and "tx.hash" will always be indexed. +indexer = "kv" + +# The PostgreSQL connection configuration, the connection format: +# postgresql://:@:/? +psql-conn = "" + +####################################################### +### Instrumentation Configuration Options ### +####################################################### +[instrumentation] + +# When true, Prometheus metrics are served under /metrics on +# PrometheusListenAddr. +# Check out the documentation for the list of available metrics. +prometheus = false + +# Address to listen for Prometheus collector(s) connections +prometheus_listen_addr = ":26660" + +# Maximum number of simultaneous connections. +# If you want to accept a larger number than the default, make sure +# you increase your OS limits. +# 0 - unlimited. +max_open_connections = 3 + +# Instrumentation namespace +namespace = "cometbft" diff --git a/test/config/init/goldens/init_with_flags/rollapp/config/genesis.json b/test/config/init/goldens/init_with_flags/rollapp/config/genesis.json index 1a5552b9..c472175e 100644 --- a/test/config/init/goldens/init_with_flags/rollapp/config/genesis.json +++ b/test/config/init/goldens/init_with_flags/rollapp/config/genesis.json @@ -217,7 +217,70 @@ "block_gas": "0" }, "genutil": { - "gen_txs": [] + "gen_txs": [ + { + "body": { + "messages": [ + { + "@type": "/cosmos.staking.v1beta1.MsgCreateValidator", + "description": { + "moniker": "hub_sequencer", + "identity": "", + "website": "", + "security_contact": "", + "details": "" + }, + "commission": { + "rate": "0.100000000000000000", + "max_rate": "0.200000000000000000", + "max_change_rate": "0.010000000000000000" + }, + "min_self_delegation": "1", + "delegator_address": "PLACEHOLDER_SEQUENCER_ADDRESS", + "validator_address": "PLACEHOLDER_SEQUENCER_GOVERNER_ADDRESS", + "pubkey": { + "@type": "/cosmos.crypto.ed25519.PubKey", + "key": "PLACEHOLDER_SEQUENCER_PUBKEY" + }, + "value": { + "denom": "udym", + "amount": "500000000000000000000" + } + } + ], + "memo": "PLACEHOLDER_GENTX_MEMO", + "timeout_height": "0", + "extension_options": [], + "non_critical_extension_options": [] + }, + "auth_info": { + "signer_infos": [ + { + "public_key": { + "@type": "/ethermint.crypto.v1.ethsecp256k1.PubKey", + "key": "PLACEHOLDER_SEQUENCER_PUBKEY" + }, + "mode_info": { + "single": { + "mode": "SIGN_MODE_DIRECT" + } + }, + "sequence": "0" + } + ], + "fee": { + "amount": [], + "gas_limit": "200000", + "payer": "", + "granter": "" + }, + "tip": null + }, + "signatures": [ + "PLACEHOLDER_SEQUENCER_SIGNATURE" + ] + } + ] }, "gov": { "starting_proposal_id": "1", diff --git a/test/config/init/goldens/init_without_flags/rollapp/config/config.toml b/test/config/init/goldens/init_without_flags/rollapp/config/config.toml index 310cb76d..1613e413 100644 --- a/test/config/init/goldens/init_without_flags/rollapp/config/config.toml +++ b/test/config/init/goldens/init_without_flags/rollapp/config/config.toml @@ -1,115 +1,471 @@ -abci = "socket" +# This is a TOML config file. +# For more information, see https://github.com/toml-lang/toml + +# NOTE: Any path below can be absolute (e.g. "/var/myawesomeapp/data") or +# relative to the home directory (e.g. "data"). The home directory is +# "$HOME/.cometbft" by default, but could be changed via $CMTHOME env variable +# or --home cmd flag. + +####################################################################### +### Main Base Config Options ### +####################################################################### + +# TCP or UNIX socket address of the ABCI application, +# or the name of an ABCI application compiled in with the CometBFT binary +proxy_app = "tcp://127.0.0.1:26658" + +# A custom human readable name for this node +moniker = "hub_sequencer" + +# If this node is many blocks behind the tip of the chain, FastSync +# allows them to catchup quickly by downloading blocks in parallel +# and verifying their commits +fast_sync = true + +# Database backend: goleveldb | cleveldb | boltdb | rocksdb | badgerdb +# * goleveldb (github.com/syndtr/goleveldb - most popular implementation) +# - pure go +# - stable +# * cleveldb (uses levigo wrapper) +# - fast +# - requires gcc +# - use cleveldb build tag (go build -tags cleveldb) +# * boltdb (uses etcd's fork of bolt - github.com/etcd-io/bbolt) +# - EXPERIMENTAL +# - may be faster is some use-cases (random reads - indexer) +# - use boltdb build tag (go build -tags boltdb) +# * rocksdb (uses github.com/tecbot/gorocksdb) +# - EXPERIMENTAL +# - requires gcc +# - use rocksdb build tag (go build -tags rocksdb) +# * badgerdb (uses github.com/dgraph-io/badger) +# - EXPERIMENTAL +# - use badgerdb build tag (go build -tags badgerdb) db_backend = "goleveldb" + +# Database directory db_dir = "data" -fast_sync = true -filter_peers = false -genesis_file = "config/genesis.json" -log_format = "plain" + +# Output level for logging, including package level options log_level = "debug" -moniker = "hub_sequencer" -node_key_file = "config/node_key.json" + +# Output format: 'plain' (colored text) or 'json' +log_format = "plain" + +##### additional base config options ##### + +# Path to the JSON file containing the initial validator set and other meta data +genesis_file = "config/genesis.json" + +# Path to the JSON file containing the private key to use as a validator in the consensus protocol priv_validator_key_file = "config/priv_validator_key.json" -priv_validator_laddr = "" + +# Path to the JSON file containing the last sign state of a validator priv_validator_state_file = "data/priv_validator_state.json" -proxy_app = "tcp://127.0.0.1:26658" -[consensus] - create_empty_blocks = true - create_empty_blocks_interval = "0s" - double_sign_check_height = 0 - peer_gossip_sleep_duration = "100ms" - peer_query_maj23_sleep_duration = "2s" - skip_timeout_commit = false - timeout_commit = "5s" - timeout_precommit = "1s" - timeout_precommit_delta = "500ms" - timeout_prevote = "1s" - timeout_prevote_delta = "500ms" - timeout_propose = "3s" - timeout_propose_delta = "500ms" - wal_file = "data/cs.wal/wal" +# TCP or UNIX socket address for CometBFT to listen on for +# connections from an external PrivValidator process +priv_validator_laddr = "" -[fastsync] - version = "v0" +# Path to the JSON file containing the private key to use for node authentication in the p2p protocol +node_key_file = "config/node_key.json" -[instrumentation] - max_open_connections = 3 - namespace = "cometbft" - prometheus = false - prometheus_listen_addr = ":26660" +# Mechanism to connect to the ABCI application: socket | grpc +abci = "socket" -[mempool] - broadcast = true - cache_size = 10000 - keep-invalid-txs-in-cache = false - max_batch_bytes = 0 - max_tx_bytes = 1048576 - max_txs_bytes = 1073741824 - recheck = true - size = 5000 - ttl-duration = "0s" - ttl-num-blocks = 0 - version = "v0" - wal_dir = "" +# If true, query the ABCI app on connecting to a new peer +# so the app can decide if we should keep the connection or not +filter_peers = false -[p2p] - addr_book_file = "config/addrbook.json" - addr_book_strict = true - allow_duplicate_ip = false - dial_timeout = "3s" - external_address = "" - flush_throttle_timeout = "100ms" - handshake_timeout = "20s" - laddr = "tcp://0.0.0.0:26656" - max_num_inbound_peers = 40 - max_num_outbound_peers = 10 - max_packet_msg_payload_size = 1024 - persistent_peers = "" - persistent_peers_max_dial_period = "0s" - pex = true - private_peer_ids = "" - recv_rate = 5120000 - seed_mode = false - seeds = "" - send_rate = 5120000 - unconditional_peer_ids = "" - upnp = false +####################################################################### +### Advanced Configuration Options ### +####################################################################### + +####################################################### +### RPC Server Configuration Options ### +####################################################### [rpc] - cors_allowed_headers = ["Origin", "Accept", "Content-Type", "X-Requested-With", "X-Server-Time"] - cors_allowed_methods = ["HEAD", "GET", "POST"] - cors_allowed_origins = ["*"] - experimental_close_on_slow_client = false - experimental_subscription_buffer_size = 200 - experimental_websocket_write_buffer_size = 200 - grpc_laddr = "" - grpc_max_open_connections = 900 - laddr = "tcp://0.0.0.0:26657" - max_body_bytes = 1000000 - max_header_bytes = 1048576 - max_open_connections = 900 - max_subscription_clients = 100 - max_subscriptions_per_client = 5 - pprof_laddr = "localhost:6060" - timeout_broadcast_tx_commit = "10s" - tls_cert_file = "" - tls_key_file = "" - unsafe = false +# TCP or UNIX socket address for the RPC server to listen on +laddr = "tcp://0.0.0.0:26657" + +# A list of origins a cross-domain request can be executed from +# Default value '[]' disables cors support +# Use '["*"]' to allow any origin +cors_allowed_origins = ["*", ] + +# A list of methods the client is allowed to use with cross-domain requests +cors_allowed_methods = ["HEAD", "GET", "POST", ] + +# A list of non simple headers the client is allowed to use with cross-domain requests +cors_allowed_headers = ["Origin", "Accept", "Content-Type", "X-Requested-With", "X-Server-Time", ] + +# TCP or UNIX socket address for the gRPC server to listen on +# NOTE: This server only supports /broadcast_tx_commit +grpc_laddr = "" + +# Maximum number of simultaneous connections. +# Does not include RPC (HTTP&WebSocket) connections. See max_open_connections +# If you want to accept a larger number than the default, make sure +# you increase your OS limits. +# 0 - unlimited. +# Should be < {ulimit -Sn} - {MaxNumInboundPeers} - {MaxNumOutboundPeers} - {N of wal, db and other open files} +# 1024 - 40 - 10 - 50 = 924 = ~900 +grpc_max_open_connections = 900 + +# Activate unsafe RPC commands like /dial_seeds and /unsafe_flush_mempool +unsafe = false + +# Maximum number of simultaneous connections (including WebSocket). +# Does not include gRPC connections. See grpc_max_open_connections +# If you want to accept a larger number than the default, make sure +# you increase your OS limits. +# 0 - unlimited. +# Should be < {ulimit -Sn} - {MaxNumInboundPeers} - {MaxNumOutboundPeers} - {N of wal, db and other open files} +# 1024 - 40 - 10 - 50 = 924 = ~900 +max_open_connections = 900 + +# Maximum number of unique clientIDs that can /subscribe +# If you're using /broadcast_tx_commit, set to the estimated maximum number +# of broadcast_tx_commit calls per block. +max_subscription_clients = 100 + +# Maximum number of unique queries a given client can /subscribe to +# If you're using GRPC (or Local RPC client) and /broadcast_tx_commit, set to +# the estimated # maximum number of broadcast_tx_commit calls per block. +max_subscriptions_per_client = 5 + +# Experimental parameter to specify the maximum number of events a node will +# buffer, per subscription, before returning an error and closing the +# subscription. Must be set to at least 100, but higher values will accommodate +# higher event throughput rates (and will use more memory). +experimental_subscription_buffer_size = 200 + +# Experimental parameter to specify the maximum number of RPC responses that +# can be buffered per WebSocket client. If clients cannot read from the +# WebSocket endpoint fast enough, they will be disconnected, so increasing this +# parameter may reduce the chances of them being disconnected (but will cause +# the node to use more memory). +# +# Must be at least the same as "experimental_subscription_buffer_size", +# otherwise connections could be dropped unnecessarily. This value should +# ideally be somewhat higher than "experimental_subscription_buffer_size" to +# accommodate non-subscription-related RPC responses. +experimental_websocket_write_buffer_size = 200 + +# If a WebSocket client cannot read fast enough, at present we may +# silently drop events instead of generating an error or disconnecting the +# client. +# +# Enabling this experimental parameter will cause the WebSocket connection to +# be closed instead if it cannot read fast enough, allowing for greater +# predictability in subscription behaviour. +experimental_close_on_slow_client = false + +# How long to wait for a tx to be committed during /broadcast_tx_commit. +# WARNING: Using a value larger than 10s will result in increasing the +# global HTTP write timeout, which applies to all connections and endpoints. +# See https://github.com/tendermint/tendermint/issues/3435 +timeout_broadcast_tx_commit = "10s" + +# Maximum size of request body, in bytes +max_body_bytes = 1000000 + +# Maximum size of request header, in bytes +max_header_bytes = 1048576 + +# The path to a file containing certificate that is used to create the HTTPS server. +# Might be either absolute path or path related to CometBFT's config directory. +# If the certificate is signed by a certificate authority, +# the certFile should be the concatenation of the server's certificate, any intermediates, +# and the CA's certificate. +# NOTE: both tls_cert_file and tls_key_file must be present for CometBFT to create HTTPS server. +# Otherwise, HTTP server is run. +tls_cert_file = "" + +# The path to a file containing matching private key that is used to create the HTTPS server. +# Might be either absolute path or path related to CometBFT's config directory. +# NOTE: both tls-cert-file and tls-key-file must be present for CometBFT to create HTTPS server. +# Otherwise, HTTP server is run. +tls_key_file = "" + +# pprof listen address (https://golang.org/pkg/net/http/pprof) +pprof_laddr = "localhost:6060" + +####################################################### +### P2P Configuration Options ### +####################################################### +[p2p] + +# Address to listen for incoming connections +laddr = "tcp://0.0.0.0:26656" + +# Address to advertise to peers for them to dial +# If empty, will use the same port as the laddr, +# and will introspect on the listener or use UPnP +# to figure out the address. ip and port are required +# example: 159.89.10.97:26656 +external_address = "" + +# Comma separated list of seed nodes to connect to +seeds = "" + +# Comma separated list of nodes to keep persistent connections to +persistent_peers = "" + +# UPNP port forwarding +upnp = false + +# Path to address book +addr_book_file = "config/addrbook.json" + +# Set true for strict address routability rules +# Set false for private or local networks +addr_book_strict = true + +# Maximum number of inbound peers +max_num_inbound_peers = 40 + +# Maximum number of outbound peers to connect to, excluding persistent peers +max_num_outbound_peers = 10 + +# List of node IDs, to which a connection will be (re)established ignoring any existing limits +unconditional_peer_ids = "" + +# Maximum pause when redialing a persistent peer (if zero, exponential backoff is used) +persistent_peers_max_dial_period = "0s" + +# Time to wait before flushing messages out on the connection +flush_throttle_timeout = "100ms" + +# Maximum size of a message packet payload, in bytes +max_packet_msg_payload_size = 1024 + +# Rate at which packets can be sent, in bytes/second +send_rate = 5120000 + +# Rate at which packets can be received, in bytes/second +recv_rate = 5120000 + +# Set true to enable the peer-exchange reactor +pex = true + +# Seed mode, in which node constantly crawls the network and looks for +# peers. If another node asks it for addresses, it responds and disconnects. +# +# Does not work if the peer-exchange reactor is disabled. +seed_mode = false + +# Comma separated list of peer IDs to keep private (will not be gossiped to other peers) +private_peer_ids = "" + +# Toggle to disable guard against peers connecting from the same ip. +allow_duplicate_ip = false + +# Peer connection configuration. +handshake_timeout = "20s" +dial_timeout = "3s" + +####################################################### +### Mempool Configuration Option ### +####################################################### +[mempool] + +# Mempool version to use: +# 1) "v0" - (default) FIFO mempool. +# 2) "v1" - prioritized mempool. +version = "v0" + +# Recheck (default: true) defines whether CometBFT should recheck the +# validity for all remaining transaction in the mempool after a block. +# Since a block affects the application state, some transactions in the +# mempool may become invalid. If this does not apply to your application, +# you can disable rechecking. +recheck = true +broadcast = true +wal_dir = "" + +# Maximum number of transactions in the mempool +size = 5000 + +# Limit the total size of all txs in the mempool. +# This only accounts for raw transactions (e.g. given 1MB transactions and +# max_txs_bytes=5MB, mempool will only accept 5 transactions). +max_txs_bytes = 1073741824 + +# Size of the cache (used to filter transactions we saw earlier) in transactions +cache_size = 10000 + +# Do not remove invalid transactions from the cache (default: false) +# Set to true if it's not possible for any invalid transaction to become valid +# again in the future. +keep-invalid-txs-in-cache = false + +# Maximum size of a single transaction. +# NOTE: the max size of a tx transmitted over the network is {max_tx_bytes}. +max_tx_bytes = 1048576 + +# Maximum size of a batch of transactions to send to a peer +# Including space needed by encoding (one varint per transaction). +# XXX: Unused due to https://github.com/tendermint/tendermint/issues/5796 +max_batch_bytes = 0 + +# ttl-duration, if non-zero, defines the maximum amount of time a transaction +# can exist for in the mempool. +# +# Note, if ttl-num-blocks is also defined, a transaction will be removed if it +# has existed in the mempool at least ttl-num-blocks number of blocks or if it's +# insertion time into the mempool is beyond ttl-duration. +ttl-duration = "0s" + +# ttl-num-blocks, if non-zero, defines the maximum number of blocks a transaction +# can exist for in the mempool. +# +# Note, if ttl-duration is also defined, a transaction will be removed if it +# has existed in the mempool at least ttl-num-blocks number of blocks or if +# it's insertion time into the mempool is beyond ttl-duration. +ttl-num-blocks = 0 + +####################################################### +### State Sync Configuration Options ### +####################################################### [statesync] - chunk_fetchers = "4" - chunk_request_timeout = "10s" - discovery_time = "15s" - enable = false - rpc_servers = "" - temp_dir = "" - trust_hash = "" - trust_height = 0 - trust_period = "168h0m0s" +# State sync rapidly bootstraps a new node by discovering, fetching, and restoring a state machine +# snapshot from peers instead of fetching and replaying historical blocks. Requires some peers in +# the network to take and serve state machine snapshots. State sync is not attempted if the node +# has any local state (LastBlockHeight > 0). The node will have a truncated block history, +# starting from the height of the snapshot. +enable = false + +# RPC servers (comma-separated) for light client verification of the synced state machine and +# retrieval of state data for node bootstrapping. Also needs a trusted height and corresponding +# header hash obtained from a trusted source, and a period during which validators can be trusted. +# +# For Cosmos SDK-based chains, trust_period should usually be about 2/3 of the unbonding time (~2 +# weeks) during which they can be financially punished (slashed) for misbehavior. +rpc_servers = "" +trust_height = 0 +trust_hash = "" +trust_period = "168h0m0s" + +# Time to spend discovering snapshots before initiating a restore. +discovery_time = "15s" + +# Temporary directory for state sync snapshot chunks, defaults to the OS tempdir (typically /tmp). +# Will create a new, randomly named directory within, and remove it when done. +temp_dir = "" + +# The timeout duration before re-requesting a chunk, possibly from a different +# peer (default: 1 minute). +chunk_request_timeout = "10s" + +# The number of concurrent chunk fetchers to run (default: 1). +chunk_fetchers = "4" + +####################################################### +### Fast Sync Configuration Connections ### +####################################################### +[fastsync] + +# Fast Sync version to use: +# 1) "v0" (default) - the legacy fast sync implementation +# 2) "v1" - refactor of v0 version for better testability +# 2) "v2" - complete redesign of v0, optimized for testability & readability +version = "v0" + +####################################################### +### Consensus Configuration Options ### +####################################################### +[consensus] + +wal_file = "data/cs.wal/wal" +# How long we wait for a proposal block before prevoting nil +timeout_propose = "3s" +# How much timeout_propose increases with each round +timeout_propose_delta = "500ms" +# How long we wait after receiving +2/3 prevotes for “anything” (ie. not a single block or nil) +timeout_prevote = "1s" +# How much the timeout_prevote increases with each round +timeout_prevote_delta = "500ms" +# How long we wait after receiving +2/3 precommits for “anything” (ie. not a single block or nil) +timeout_precommit = "1s" +# How much the timeout_precommit increases with each round +timeout_precommit_delta = "500ms" +# How long we wait after committing a block, before starting on the new +# height (this gives us a chance to receive some more precommits, even +# though we already have +2/3). +timeout_commit = "5s" + +# How many blocks to look back to check existence of the node's consensus votes before joining consensus +# When non-zero, the node will panic upon restart +# if the same consensus key was used to sign {double_sign_check_height} last blocks. +# So, validators should stop the state machine, wait for some blocks, and then restart the state machine to avoid panic. +double_sign_check_height = 0 + +# Make progress as soon as we have all the precommits (as if TimeoutCommit = 0) +skip_timeout_commit = false + +# EmptyBlocks mode and possible interval between empty blocks +create_empty_blocks = true +create_empty_blocks_interval = "0s" + +# Reactor sleep duration parameters +peer_gossip_sleep_duration = "100ms" +peer_query_maj23_sleep_duration = "2s" + +####################################################### +### Storage Configuration Options ### +####################################################### [storage] - discard_abci_responses = false +# Set to true to discard ABCI responses from the state store, which can save a +# considerable amount of disk space. Set to false to ensure ABCI responses are +# persisted. ABCI responses are required for /block_results RPC queries, and to +# reindex events in the command-line tool. +discard_abci_responses = false + +####################################################### +### Transaction Indexer Configuration Options ### +####################################################### [tx_index] - indexer = "kv" - psql-conn = "" + +# What indexer to use for transactions +# +# The application will set which txs to index. In some cases a node operator will be able +# to decide which txs to index based on configuration set in the application. +# +# Options: +# 1) "null" +# 2) "kv" (default) - the simplest possible indexer, backed by key-value storage (defaults to levelDB; see DBBackend). +# - When "kv" is chosen "tx.height" and "tx.hash" will always be indexed. +# 3) "psql" - the indexer services backed by PostgreSQL. +# When "kv" or "psql" is chosen "tx.height" and "tx.hash" will always be indexed. +indexer = "kv" + +# The PostgreSQL connection configuration, the connection format: +# postgresql://:@:/? +psql-conn = "" + +####################################################### +### Instrumentation Configuration Options ### +####################################################### +[instrumentation] + +# When true, Prometheus metrics are served under /metrics on +# PrometheusListenAddr. +# Check out the documentation for the list of available metrics. +prometheus = false + +# Address to listen for Prometheus collector(s) connections +prometheus_listen_addr = ":26660" + +# Maximum number of simultaneous connections. +# If you want to accept a larger number than the default, make sure +# you increase your OS limits. +# 0 - unlimited. +max_open_connections = 3 + +# Instrumentation namespace +namespace = "cometbft" diff --git a/test/config/init/goldens/init_without_flags/rollapp/config/genesis.json b/test/config/init/goldens/init_without_flags/rollapp/config/genesis.json index cd3319c3..c34effa8 100644 --- a/test/config/init/goldens/init_without_flags/rollapp/config/genesis.json +++ b/test/config/init/goldens/init_without_flags/rollapp/config/genesis.json @@ -217,7 +217,70 @@ "block_gas": "0" }, "genutil": { - "gen_txs": [] + "gen_txs": [ + { + "body": { + "messages": [ + { + "@type": "/cosmos.staking.v1beta1.MsgCreateValidator", + "description": { + "moniker": "hub_sequencer", + "identity": "", + "website": "", + "security_contact": "", + "details": "" + }, + "commission": { + "rate": "0.100000000000000000", + "max_rate": "0.200000000000000000", + "max_change_rate": "0.010000000000000000" + }, + "min_self_delegation": "1", + "delegator_address": "PLACEHOLDER_SEQUENCER_ADDRESS", + "validator_address": "PLACEHOLDER_SEQUENCER_GOVERNER_ADDRESS", + "pubkey": { + "@type": "/cosmos.crypto.ed25519.PubKey", + "key": "PLACEHOLDER_SEQUENCER_PUBKEY" + }, + "value": { + "denom": "udym", + "amount": "500000000000000000000000000" + } + } + ], + "memo": "PLACEHOLDER_GENTX_MEMO", + "timeout_height": "0", + "extension_options": [], + "non_critical_extension_options": [] + }, + "auth_info": { + "signer_infos": [ + { + "public_key": { + "@type": "/ethermint.crypto.v1.ethsecp256k1.PubKey", + "key": "PLACEHOLDER_SEQUENCER_PUBKEY" + }, + "mode_info": { + "single": { + "mode": "SIGN_MODE_DIRECT" + } + }, + "sequence": "0" + } + ], + "fee": { + "amount": [], + "gas_limit": "200000", + "payer": "", + "granter": "" + }, + "tip": null + }, + "signatures": [ + "PLACEHOLDER_SEQUENCER_SIGNATURE" + ] + } + ] }, "gov": { "starting_proposal_id": "1", diff --git a/test/config/init/init_test.go b/test/config/init/init_test.go index d39cc190..f5927e99 100644 --- a/test/config/init/init_test.go +++ b/test/config/init/init_test.go @@ -2,10 +2,11 @@ package initconfig_test import ( "fmt" - "github.com/dymensionxyz/roller/config" "path/filepath" "testing" + "github.com/dymensionxyz/roller/config" + "os" initconfig "github.com/dymensionxyz/roller/cmd/config/init" @@ -19,16 +20,19 @@ func TestInitCmd(t *testing.T) { testCases := []struct { name string goldenDirPath string + excludedDirs []string optionalFlags []string }{ { name: "Roller config init with default values", goldenDirPath: "./goldens/init_without_flags", + excludedDirs: []string{"gentx"}, optionalFlags: []string{}, }, { name: "Roller config init with custom flags", goldenDirPath: "./goldens/init_with_flags", + excludedDirs: []string{"gentx"}, optionalFlags: []string{ "--" + initconfig.FlagNames.TokenSupply, tokenSupply, }, @@ -63,7 +67,7 @@ func TestInitCmd(t *testing.T) { assert.NoError(testutils.VerifyRelayerKeys(tempDir, rollappID, initConfig.HubData.ID)) assert.NoError(testutils.VerifyCelestiaLightNodeKeys(tempDir)) assert.NoError(testutils.SanitizeConfigDir(tempDir)) - areDirsEqual, err := testutils.CompareDirs(tempDir, tc.goldenDirPath) + areDirsEqual, err := testutils.CompareDirs(tempDir, tc.goldenDirPath, tc.excludedDirs...) assert.NoError(err) assert.True(areDirsEqual) }) diff --git a/test/config/init/testutils/compare.go b/test/config/init/testutils/compare.go index 91d2c1b3..f0e5f035 100644 --- a/test/config/init/testutils/compare.go +++ b/test/config/init/testutils/compare.go @@ -9,14 +9,24 @@ import ( "github.com/google/go-cmp/cmp" ) -func dirContent(dirPath string) (map[string]string, error) { +func dirContent(dirPath string, excludeDirs ...string) (map[string]string, error) { content := make(map[string]string) + excluded := make(map[string]bool) + for _, dir := range excludeDirs { + excluded[dir] = true + } + err := filepath.WalkDir(dirPath, func(path string, d fs.DirEntry, err error) error { if err != nil { return err } + // If the directory is in the excluded list, skip it + if d.IsDir() && excluded[d.Name()] { + return fs.SkipDir + } + if !d.IsDir() { data, err := os.ReadFile(path) if err != nil { @@ -35,13 +45,13 @@ func dirContent(dirPath string) (map[string]string, error) { return content, err } -func CompareDirs(dir1, dir2 string) (bool, error) { - content1, err := dirContent(dir1) +func CompareDirs(dir1, dir2 string, excludeDirs ...string) (bool, error) { + content1, err := dirContent(dir1, excludeDirs...) if err != nil { return false, err } - content2, err := dirContent(dir2) + content2, err := dirContent(dir2, excludeDirs...) if err != nil { return false, err } diff --git a/test/config/init/testutils/rollapp.go b/test/config/init/testutils/rollapp.go index 4faf0761..41d22a66 100644 --- a/test/config/init/testutils/rollapp.go +++ b/test/config/init/testutils/rollapp.go @@ -93,6 +93,30 @@ func SanitizeGenesis(genesisPath string) error { Path: "app_state.sequencers.sequencers.0.consensus_pubkey.key", Value: "PLACEHOLDER_CONSENSUS_PUBKEY", }, + { + Path: "app_state.genutil.gen_txs.0.body.messages.0.delegator_address", + Value: "PLACEHOLDER_SEQUENCER_ADDRESS", + }, + { + Path: "app_state.genutil.gen_txs.0.body.messages.0.pubkey.key", + Value: "PLACEHOLDER_SEQUENCER_PUBKEY", + }, + { + Path: "app_state.genutil.gen_txs.0.body.messages.0.validator_address", + Value: "PLACEHOLDER_SEQUENCER_GOVERNER_ADDRESS", + }, + { + Path: "app_state.genutil.gen_txs.0.signatures.0", + Value: "PLACEHOLDER_SEQUENCER_SIGNATURE", + }, + { + Path: "app_state.genutil.gen_txs.0.body.memo", + Value: "PLACEHOLDER_GENTX_MEMO", + }, + { + Path: "app_state.genutil.gen_txs.0.auth_info.signer_infos.0.public_key.key", + Value: "PLACEHOLDER_SEQUENCER_PUBKEY", + }, } err := initconfig.UpdateJSONParams(genesisPath, params)