Skip to content

Commit

Permalink
Merge branch 'develop' into hsm-signer
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinssgh authored Nov 16, 2023
2 parents 2709f1e + 23c7d9a commit 3f766a8
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions contrib/localnet/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ services:
- "1317:1317"
- "9545:8545"
- "9546:8546"
- "26657:26657"
networks:
mynetwork:
ipv4_address: 172.20.0.11
Expand Down
2 changes: 1 addition & 1 deletion contrib/localnet/zetacored/common/client.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
###############################################################################

# The network chain ID
chain-id = ""
chain-id = "athens_101-1"
# The keyring's backend, where the keys are stored (os|file|kwallet|pass|test|memory)
keyring-backend = "test"
# CLI output format (text|json)
Expand Down
2 changes: 1 addition & 1 deletion contrib/localnet/zetacored/common/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ external_address = ""
seeds = ""

# Comma separated list of nodes to keep persistent connections to
persistent_peers = "0d88fbe57ac13ba86c40f4c82b8a4170e79de21a@172.20.0.12:26656"
persistent_peers = "0d88fbe57ac13ba86c40f4c82b8a4170e79de21a@zetacore1:26656"

# UPNP port forwarding
upnp = false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
###############################################################################

# The network chain ID
chain-id = ""
chain-id = "athens_101-1"
# The keyring's backend, where the keys are stored (os|file|kwallet|pass|test|memory)
keyring-backend = "test"
# CLI output format (text|json)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
###############################################################################

# The network chain ID
chain-id = ""
chain-id = "athens_101-1"
# The keyring's backend, where the keys are stored (os|file|kwallet|pass|test|memory)
keyring-backend = "test"
# CLI output format (text|json)
Expand Down

0 comments on commit 3f766a8

Please sign in to comment.