From cf6b63ff2852e2150444b9fd2e5d936fc012c020 Mon Sep 17 00:00:00 2001 From: albttx Date: Thu, 23 May 2024 15:37:01 +0100 Subject: [PATCH 1/5] chore: remove all occurence of port 36657 to 26657 --- .gitpod.yml | 2 +- Dockerfile.gnoland.release | 2 +- contribs/gnodev/cmd/gnodev/main.go | 2 +- docs/how-to-guides/interact-with-gnoland.md | 12 ++++++------ docs/reference/network-config.md | 2 +- .../tm2-js-client/Provider/json-rpc-provider.md | 2 +- docs/reference/tm2-js-client/Provider/ws-provider.md | 10 +++++----- examples/gno.land/r/demo/boards/README.md | 2 +- gnovm/cmd/gno/mod.go | 2 +- gnovm/pkg/gnomod/file_test.go | 2 +- misc/deployments/staging.gno.land/docker-compose.yml | 12 ++++++------ .../deployments/staging.gno.land/overlay/config.toml | 2 +- misc/deployments/test2.gno.land/Makefile | 4 ++-- misc/deployments/test2.gno.land/docker-compose.yml | 12 ++++++------ misc/deployments/test2.gno.land/overlay/config.toml | 2 +- misc/deployments/test3.gno.land/Makefile | 4 ++-- misc/deployments/test3.gno.land/docker-compose.yml | 12 ++++++------ misc/deployments/test3.gno.land/overlay/config.toml | 2 +- tm2/pkg/bft/rpc/config/config.go | 2 +- 19 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 794108f4613..49dec8ed15d 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -37,7 +37,7 @@ ports: - name: "gnoland RPC" description: "the RPC server, managed by tendermint2" - port: 36657 + port: 26657 onOpen: notify github: diff --git a/Dockerfile.gnoland.release b/Dockerfile.gnoland.release index f8bd321f67f..181b71c0bf3 100644 --- a/Dockerfile.gnoland.release +++ b/Dockerfile.gnoland.release @@ -8,6 +8,6 @@ COPY ./gno.land/genesis/genesis_txs.jsonl /gnoroot/gno.land/genesis/genesis_txs. ENV GNOROOT="/gnoroot/" -EXPOSE 26657 36657 +EXPOSE 26657 26657 ENTRYPOINT [ "/gnoland" ] CMD [ "" ] \ No newline at end of file diff --git a/contribs/gnodev/cmd/gnodev/main.go b/contribs/gnodev/cmd/gnodev/main.go index 9b769321c83..0aa83940039 100644 --- a/contribs/gnodev/cmd/gnodev/main.go +++ b/contribs/gnodev/cmd/gnodev/main.go @@ -64,7 +64,7 @@ var defaultDevOptions = &devCfg{ chainId: "dev", maxGas: 10_000_000_000, webListenerAddr: "127.0.0.1:8888", - nodeRPCListenerAddr: "127.0.0.1:36657", + nodeRPCListenerAddr: "127.0.0.1:26657", deployKey: DefaultDeployerAddress.String(), home: gnoenv.HomeDir(), root: gnoenv.RootDir(), diff --git a/docs/how-to-guides/interact-with-gnoland.md b/docs/how-to-guides/interact-with-gnoland.md index 527e20981a7..c4b2bd8c043 100644 --- a/docs/how-to-guides/interact-with-gnoland.md +++ b/docs/how-to-guides/interact-with-gnoland.md @@ -29,7 +29,7 @@ gnokey maketx call \ -gas-fee="1ugnot" \ -gas-wanted="5000000" \ -broadcast="true" \ - -remote="staging.gno.land:36657" \ + -remote="staging.gno.land:26657" \ -chainid="test3" \ -pkgpath="gno.land/r/demo/users" \ -func="Register" \ @@ -48,13 +48,13 @@ gnokey maketx call \ ```bash # Get account information -gnokey query -remote="staging.gno.land:36657" "auth/accounts/{address}" +gnokey query -remote="staging.gno.land:26657" "auth/accounts/{address}" # Get account balance -gnokey query -remote="staging.gno.land:36657" "bank/balances/{address}" +gnokey query -remote="staging.gno.land:26657" "bank/balances/{address}" # Get /r/demo/boards user information -gnokey query -remote="staging.gno.land:36657" -data "gno.land/r/demo/users +gnokey query -remote="staging.gno.land:26657" -data "gno.land/r/demo/users my_account" "vm/qrender" ``` @@ -68,7 +68,7 @@ gnokey maketx send \ -gas-fee="1ugnot" \ -gas-wanted="5000000" \ -broadcast="true" \ - -remote="staging.gno.land:36657" \ + -remote="staging.gno.land:26657" \ -chainid="test3" \ -to="{address}" \ # g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5 -send="{amount}{denom}" \ # 1234ugnot @@ -85,7 +85,7 @@ gnokey maketx call \ -gas-fee="1ugnot" \ -gas-wanted="5000000" \ -broadcast="true" \ - -remote "staging.gno.land:36657" \ + -remote "staging.gno.land:26657" \ -chainid="test3" \ -pkgpath="gno.land/r/demo/boards" \ -func="CreateBoard" \ diff --git a/docs/reference/network-config.md b/docs/reference/network-config.md index 0d933db39f4..c2ec5409fc9 100644 --- a/docs/reference/network-config.md +++ b/docs/reference/network-config.md @@ -9,7 +9,7 @@ id: network-config | Portal Loop | https://rpc.gno.land:443 | `portal-loop` | | Testnet 4 | upcoming | upcoming | | Testnet 3 | https://rpc.test3.gno.land:443 | `test3` | -| Staging | https://rpc.staging.gno.land:36657 | `test3` | +| Staging | https://rpc.staging.gno.land:26657 | `test3` | ### WebSocket endpoints All networks follow the same pattern for websocket connections: diff --git a/docs/reference/tm2-js-client/Provider/json-rpc-provider.md b/docs/reference/tm2-js-client/Provider/json-rpc-provider.md index b7700e1d97c..50d816e89f9 100644 --- a/docs/reference/tm2-js-client/Provider/json-rpc-provider.md +++ b/docs/reference/tm2-js-client/Provider/json-rpc-provider.md @@ -17,6 +17,6 @@ Creates a new instance of the JSON-RPC Provider #### Usage ```ts -new JSONRPCProvider('http://staging.gno.land:36657'); +new JSONRPCProvider('http://staging.gno.land:26657'); // provider is created ``` diff --git a/docs/reference/tm2-js-client/Provider/ws-provider.md b/docs/reference/tm2-js-client/Provider/ws-provider.md index ef91f45d4e2..9d4f2390c28 100644 --- a/docs/reference/tm2-js-client/Provider/ws-provider.md +++ b/docs/reference/tm2-js-client/Provider/ws-provider.md @@ -18,7 +18,7 @@ Creates a new instance of the WebSocket Provider #### Usage ```ts -new WSProvider('ws://staging.gno.land:36657/ws'); +new WSProvider('ws://staging.gno.land:26657/ws'); // provider with WS connection is created ``` @@ -30,7 +30,7 @@ with the WS provider #### Usage ```ts -const wsProvider = new WSProvider('ws://staging.gno.land:36657/ws'); +const wsProvider = new WSProvider('ws://staging.gno.land:26657/ws'); wsProvider.closeConnection(); // WS connection is now closed @@ -52,7 +52,7 @@ Returns **Promise>** ```ts const request: RPCRequest = // ... -const wsProvider = new WSProvider('ws://staging.gno.land:36657/ws'); +const wsProvider = new WSProvider('ws://staging.gno.land:26657/ws'); wsProvider.sendRequest(request); // request is sent over the open WS connection @@ -73,7 +73,7 @@ Returns **Result** ```ts const response: RPCResponse = // ... -const wsProvider = new WSProvider('ws://staging.gno.land:36657/ws'); +const wsProvider = new WSProvider('ws://staging.gno.land:26657/ws'); wsProvider.parseResponse(response); // response is parsed @@ -88,7 +88,7 @@ Returns **Promise** #### Usage ```ts -const wsProvider = new WSProvider('ws://staging.gno.land:36657/ws'); +const wsProvider = new WSProvider('ws://staging.gno.land:26657/ws'); await wsProvider.waitForOpenConnection() // status of the connection is: CONNECTED diff --git a/examples/gno.land/r/demo/boards/README.md b/examples/gno.land/r/demo/boards/README.md index 849998b04e9..6e3dac115b1 100644 --- a/examples/gno.land/r/demo/boards/README.md +++ b/examples/gno.land/r/demo/boards/README.md @@ -8,7 +8,7 @@ name ["gno.land/r/demo/boards"](https://gno.land/r/demo/boards/) ## Build `gnokey`, create your account, and interact with Gno. NOTE: Where you see `-remote localhost:26657` here, that flag can be replaced -with `-remote test3.gno.land:36657` if you have $GNOT on the testnet. +with `-remote test3.gno.land:26657` if you have $GNOT on the testnet. (To use the testnet, also replace `-chainid dev` with `-chainid test3` .) ### Build `gnokey` (and other tools). diff --git a/gnovm/cmd/gno/mod.go b/gnovm/cmd/gno/mod.go index 6c310cd7425..19d7b121970 100644 --- a/gnovm/cmd/gno/mod.go +++ b/gnovm/cmd/gno/mod.go @@ -128,7 +128,7 @@ func (c *modDownloadCfg) RegisterFlags(fs *flag.FlagSet) { fs.StringVar( &c.remote, "remote", - "test3.gno.land:36657", + "test3.gno.land:26657", "remote for fetching gno modules", ) diff --git a/gnovm/pkg/gnomod/file_test.go b/gnovm/pkg/gnomod/file_test.go index 0012960eb4f..7abfe16f340 100644 --- a/gnovm/pkg/gnomod/file_test.go +++ b/gnovm/pkg/gnomod/file_test.go @@ -14,7 +14,7 @@ import ( "golang.org/x/mod/module" ) -const testRemote string = "test3.gno.land:36657" +const testRemote string = "test3.gno.land:26657" func TestFetchDeps(t *testing.T) { for _, tc := range []struct { diff --git a/misc/deployments/staging.gno.land/docker-compose.yml b/misc/deployments/staging.gno.land/docker-compose.yml index 991a102b691..3d5d220a861 100644 --- a/misc/deployments/staging.gno.land/docker-compose.yml +++ b/misc/deployments/staging.gno.land/docker-compose.yml @@ -6,7 +6,7 @@ services: build: ../../.. environment: - VIRTUAL_HOST=rpc.staging.gno.land - - VIRTUAL_PORT=36657 + - VIRTUAL_PORT=26657 - LETSENCRYPT_HOST=rpc.staging.gno.land - LOG_LEVEL=4 working_dir: /opt/gno/src/gno.land @@ -15,12 +15,12 @@ services: - start - --skip-failing-genesis-txs - --chainid=staging - - --genesis-remote=staging.gno.land:36657 + - --genesis-remote=staging.gno.land:26657 volumes: - "./data/gnoland:/opt/gno/src/gno.land/gnoland-data" ports: - 36656:36656 - - 36657:36657 + - 26657:26657 restart: on-failure logging: driver: "json-file" @@ -34,11 +34,11 @@ services: command: - gnoweb - --bind=0.0.0.0:80 - - --remote=gnoland:36657 + - --remote=gnoland:26657 - --captcha-site=$RECAPTCHA_SITE_KEY - --faucet-url=https://faucet-staging.gno.land/ - --help-chainid=staging - - --help-remote=staging.gno.land:36657 + - --help-remote=staging.gno.land:26657 - --with-analytics volumes: - "./overlay:/overlay:ro" @@ -64,7 +64,7 @@ services: mkdir -p /.gno && expect -c \"set timeout -1; spawn gnokey add --home /.gno/ --recover faucet; expect \\\"Enter a passphrase\\\"; send \\\"$GNOKEY_PASS\\r\\\"; expect \\\"Repeat the passphrase\\\"; send \\\"$GNOKEY_PASS\\r\\\"; expect \\\"Enter your bip39 mnemonic\\\"; send \\\"$FAUCET_WORDS\\r\\\"; expect eof\" && while true; do - expect -c \"set timeout -1; spawn gnofaucet serve --send 50000000ugnot --captcha-secret \\\"$RECAPTCHA_SECRET_KEY\\\" --remote gnoland:36657 --chain-id staging --home /.gno/ faucet; expect \\\"Enter password\\\"; send \\\"$GNOKEY_PASS\\r\\\"; expect eof\"; + expect -c \"set timeout -1; spawn gnofaucet serve --send 50000000ugnot --captcha-secret \\\"$RECAPTCHA_SECRET_KEY\\\" --remote gnoland:26657 --chain-id staging --home /.gno/ faucet; expect \\\"Enter password\\\"; send \\\"$GNOKEY_PASS\\r\\\"; expect eof\"; sleep 5; done " diff --git a/misc/deployments/staging.gno.land/overlay/config.toml b/misc/deployments/staging.gno.land/overlay/config.toml index 1f5952f9638..798b0fdea2d 100644 --- a/misc/deployments/staging.gno.land/overlay/config.toml +++ b/misc/deployments/staging.gno.land/overlay/config.toml @@ -72,7 +72,7 @@ filter_peers = false [rpc] # TCP or UNIX socket address for the RPC server to listen on -laddr = "tcp://0.0.0.0:36657" +laddr = "tcp://0.0.0.0:26657" # A list of origins a cross-domain request can be executed from # Default value '[]' disables cors support diff --git a/misc/deployments/test2.gno.land/Makefile b/misc/deployments/test2.gno.land/Makefile index ad334f31243..a77a81f62d0 100644 --- a/misc/deployments/test2.gno.land/Makefile +++ b/misc/deployments/test2.gno.land/Makefile @@ -25,9 +25,9 @@ build: gnotxport: #docker build -t gno ../.. - docker run -v "$(PWD):$(PWD)" -w "$(PWD)" gno gnotxport export --remote test2.gno.land:36657 + docker run -v "$(PWD):$(PWD)" -w "$(PWD)" gno gnotxport export --remote test2.gno.land:26657 tail -n 1 txexport.log wc -l txexport.log gnotximport: - docker run -v "$(PWD):$(PWD)" -w "$(PWD)" gno gnotxport import --remote test2.gno.land:36657 + docker run -v "$(PWD):$(PWD)" -w "$(PWD)" gno gnotxport import --remote test2.gno.land:26657 diff --git a/misc/deployments/test2.gno.land/docker-compose.yml b/misc/deployments/test2.gno.land/docker-compose.yml index c836c0cc65f..8d1698060ff 100644 --- a/misc/deployments/test2.gno.land/docker-compose.yml +++ b/misc/deployments/test2.gno.land/docker-compose.yml @@ -7,7 +7,7 @@ services: environment: - LOG_LEVEL=4 - VIRTUAL_HOST=rpc.test2.gno.land - - VIRTUAL_PORT=36657 + - VIRTUAL_PORT=26657 - LETSENCRYPT_HOST=rpc.test2.gno.land command: - gnoland @@ -16,7 +16,7 @@ services: - --chainid - test2 - --genesis-remote - - test2.gno.land:36657 + - test2.gno.land:26657 - --genesis-balances-file - /overlay/balances.txt volumes: @@ -24,7 +24,7 @@ services: - "./overlay:/overlay:ro" ports: - 36656:36656 - - 36657:36657 + - 26657:26657 restart: on-failure logging: driver: "json-file" @@ -40,7 +40,7 @@ services: - --bind - 0.0.0.0:80 - --remote - - gnoland:36657 + - gnoland:26657 - --captcha-site - $RECAPTCHA_SITE_KEY - --faucet-url @@ -48,7 +48,7 @@ services: - --help-chainid - test2 - --help-remote - - test2.gno.land:36657 + - test2.gno.land:26657 - --home-content - /overlay/HOME.md volumes: @@ -75,7 +75,7 @@ services: mkdir -p /.gno && expect -c \"set timeout -1; spawn gnokey add faucet --home /.gno/ --recover; expect \\\"Enter a passphrase\\\"; send \\\"$GNOKEY_PASS\\r\\\"; expect \\\"Repeat the passphrase\\\"; send \\\"$GNOKEY_PASS\\r\\\"; expect \\\"Enter your bip39 mnemonic\\\"; send \\\"$FAUCET_WORDS\\r\\\"; expect eof\" && while true; do - expect -c \"set timeout -1; spawn gnofaucet serve faucet --is-behind-proxy --send 50000000ugnot --captcha-secret \\\"$RECAPTCHA_SECRET_KEY\\\" --remote gnoland:36657 --chain-id test2 --home /.gno/; expect \\\"Enter password.\\\"; send \\\"$GNOKEY_PASS\\r\\\"; expect eof\"; + expect -c \"set timeout -1; spawn gnofaucet serve faucet --is-behind-proxy --send 50000000ugnot --captcha-secret \\\"$RECAPTCHA_SECRET_KEY\\\" --remote gnoland:26657 --chain-id test2 --home /.gno/; expect \\\"Enter password.\\\"; send \\\"$GNOKEY_PASS\\r\\\"; expect eof\"; sleep 5; done " diff --git a/misc/deployments/test2.gno.land/overlay/config.toml b/misc/deployments/test2.gno.land/overlay/config.toml index 65e34a2c55c..84d98be8d24 100644 --- a/misc/deployments/test2.gno.land/overlay/config.toml +++ b/misc/deployments/test2.gno.land/overlay/config.toml @@ -72,7 +72,7 @@ filter_peers = false [rpc] # TCP or UNIX socket address for the RPC server to listen on -laddr = "tcp://0.0.0.0:36657" +laddr = "tcp://0.0.0.0:26657" # A list of origins a cross-domain request can be executed from # Default value '[]' disables cors support diff --git a/misc/deployments/test3.gno.land/Makefile b/misc/deployments/test3.gno.land/Makefile index d52b95b260b..5d998e8cc6f 100644 --- a/misc/deployments/test3.gno.land/Makefile +++ b/misc/deployments/test3.gno.land/Makefile @@ -28,9 +28,9 @@ build: gnotxport: #docker build -t gno ../.. - docker run -v "$(PWD):$(PWD)" -w "$(PWD)" gno gnotxport export --remote test3.gno.land:36657 + docker run -v "$(PWD):$(PWD)" -w "$(PWD)" gno gnotxport export --remote test3.gno.land:26657 tail -n 1 txexport.log wc -l txexport.log gnotximport: - docker run -v "$(PWD):$(PWD)" -w "$(PWD)" gno gnotxport import --remote test3.gno.land:36657 + docker run -v "$(PWD):$(PWD)" -w "$(PWD)" gno gnotxport import --remote test3.gno.land:26657 diff --git a/misc/deployments/test3.gno.land/docker-compose.yml b/misc/deployments/test3.gno.land/docker-compose.yml index b76d5c3e379..ba7d18dabb4 100644 --- a/misc/deployments/test3.gno.land/docker-compose.yml +++ b/misc/deployments/test3.gno.land/docker-compose.yml @@ -7,7 +7,7 @@ services: environment: - LOG_LEVEL=4 - VIRTUAL_HOST=rpc.test3.gno.land - - VIRTUAL_PORT=36657 + - VIRTUAL_PORT=26657 - LETSENCRYPT_HOST=rpc.test3.gno.land command: - gnoland @@ -16,7 +16,7 @@ services: - --chainid - test3 - --genesis-remote - - test3.gno.land:36657 + - test3.gno.land:26657 - --genesis-balances-file - /overlay/balances.txt - --genesis-txs-file @@ -26,7 +26,7 @@ services: - "./overlay:/overlay:ro" ports: - 36656:36656 - - 36657:36657 + - 26657:26657 restart: on-failure logging: driver: "json-file" @@ -42,7 +42,7 @@ services: - --bind - 0.0.0.0:80 - --remote - - gnoland:36657 + - gnoland:26657 - --captcha-site - $RECAPTCHA_SITE_KEY - --faucet-url @@ -50,7 +50,7 @@ services: - --help-chainid - test3 - --help-remote - - test3.gno.land:36657 + - test3.gno.land:26657 - --home-content - /overlay/HOME.md volumes: @@ -77,7 +77,7 @@ services: mkdir -p /.gno && expect -c \"set timeout -1; spawn gnokey add faucet --home /.gno/ --recover; expect \\\"Enter a passphrase\\\"; send \\\"$GNOKEY_PASS\\r\\\"; expect \\\"Repeat the passphrase\\\"; send \\\"$GNOKEY_PASS\\r\\\"; expect \\\"Enter your bip39 mnemonic\\\"; send \\\"$FAUCET_WORDS\\r\\\"; expect eof\" && while true; do - expect -c \"set timeout -1; spawn gnofaucet serve faucet --is-behind-proxy --send 50000000ugnot --captcha-secret \\\"$RECAPTCHA_SECRET_KEY\\\" --remote gnoland:36657 --chain-id test3 --home /.gno/; expect \\\"Enter password.\\\"; send \\\"$GNOKEY_PASS\\r\\\"; expect eof\"; + expect -c \"set timeout -1; spawn gnofaucet serve faucet --is-behind-proxy --send 50000000ugnot --captcha-secret \\\"$RECAPTCHA_SECRET_KEY\\\" --remote gnoland:26657 --chain-id test3 --home /.gno/; expect \\\"Enter password.\\\"; send \\\"$GNOKEY_PASS\\r\\\"; expect eof\"; sleep 5; done " diff --git a/misc/deployments/test3.gno.land/overlay/config.toml b/misc/deployments/test3.gno.land/overlay/config.toml index 65e34a2c55c..84d98be8d24 100644 --- a/misc/deployments/test3.gno.land/overlay/config.toml +++ b/misc/deployments/test3.gno.land/overlay/config.toml @@ -72,7 +72,7 @@ filter_peers = false [rpc] # TCP or UNIX socket address for the RPC server to listen on -laddr = "tcp://0.0.0.0:36657" +laddr = "tcp://0.0.0.0:26657" # A list of origins a cross-domain request can be executed from # Default value '[]' disables cors support diff --git a/tm2/pkg/bft/rpc/config/config.go b/tm2/pkg/bft/rpc/config/config.go index 1428861626c..5fe130eda9e 100644 --- a/tm2/pkg/bft/rpc/config/config.go +++ b/tm2/pkg/bft/rpc/config/config.go @@ -111,7 +111,7 @@ func DefaultRPCConfig() *RPCConfig { // TestRPCConfig returns a configuration for testing the RPC server func TestRPCConfig() *RPCConfig { cfg := DefaultRPCConfig() - cfg.ListenAddress = "tcp://0.0.0.0:36657" + cfg.ListenAddress = "tcp://0.0.0.0:26657" cfg.GRPCListenAddress = "tcp://0.0.0.0:36658" cfg.Unsafe = true return cfg From f70c8d19d14f2c665b3af4aabfbc178bfe6ff73f Mon Sep 17 00:00:00 2001 From: albttx Date: Thu, 23 May 2024 15:42:07 +0100 Subject: [PATCH 2/5] chore: s/36656/26656/g --- misc/deployments/staging.gno.land/docker-compose.yml | 2 +- misc/deployments/staging.gno.land/overlay/config.toml | 2 +- misc/deployments/test2.gno.land/docker-compose.yml | 2 +- misc/deployments/test2.gno.land/overlay/config.toml | 2 +- misc/deployments/test3.gno.land/docker-compose.yml | 2 +- misc/deployments/test3.gno.land/overlay/config.toml | 2 +- tm2/pkg/p2p/config/config.go | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/misc/deployments/staging.gno.land/docker-compose.yml b/misc/deployments/staging.gno.land/docker-compose.yml index 3d5d220a861..3479067372d 100644 --- a/misc/deployments/staging.gno.land/docker-compose.yml +++ b/misc/deployments/staging.gno.land/docker-compose.yml @@ -19,7 +19,7 @@ services: volumes: - "./data/gnoland:/opt/gno/src/gno.land/gnoland-data" ports: - - 36656:36656 + - 26656:26656 - 26657:26657 restart: on-failure logging: diff --git a/misc/deployments/staging.gno.land/overlay/config.toml b/misc/deployments/staging.gno.land/overlay/config.toml index 798b0fdea2d..89746e75c4f 100644 --- a/misc/deployments/staging.gno.land/overlay/config.toml +++ b/misc/deployments/staging.gno.land/overlay/config.toml @@ -139,7 +139,7 @@ tls_key_file = "" [p2p] # Address to listen for incoming connections -laddr = "tcp://0.0.0.0:36656" +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, diff --git a/misc/deployments/test2.gno.land/docker-compose.yml b/misc/deployments/test2.gno.land/docker-compose.yml index 8d1698060ff..ad613b3f246 100644 --- a/misc/deployments/test2.gno.land/docker-compose.yml +++ b/misc/deployments/test2.gno.land/docker-compose.yml @@ -23,7 +23,7 @@ services: - "./data/gnoland:/opt/gno/src/testdir" - "./overlay:/overlay:ro" ports: - - 36656:36656 + - 26656:26656 - 26657:26657 restart: on-failure logging: diff --git a/misc/deployments/test2.gno.land/overlay/config.toml b/misc/deployments/test2.gno.land/overlay/config.toml index 84d98be8d24..ac34760de62 100644 --- a/misc/deployments/test2.gno.land/overlay/config.toml +++ b/misc/deployments/test2.gno.land/overlay/config.toml @@ -139,7 +139,7 @@ tls_key_file = "" [p2p] # Address to listen for incoming connections -laddr = "tcp://0.0.0.0:36656" +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, diff --git a/misc/deployments/test3.gno.land/docker-compose.yml b/misc/deployments/test3.gno.land/docker-compose.yml index ba7d18dabb4..4f27461fdee 100644 --- a/misc/deployments/test3.gno.land/docker-compose.yml +++ b/misc/deployments/test3.gno.land/docker-compose.yml @@ -25,7 +25,7 @@ services: - "./data/gnoland:/opt/gno/src/testdir" - "./overlay:/overlay:ro" ports: - - 36656:36656 + - 26656:26656 - 26657:26657 restart: on-failure logging: diff --git a/misc/deployments/test3.gno.land/overlay/config.toml b/misc/deployments/test3.gno.land/overlay/config.toml index 84d98be8d24..ac34760de62 100644 --- a/misc/deployments/test3.gno.land/overlay/config.toml +++ b/misc/deployments/test3.gno.land/overlay/config.toml @@ -139,7 +139,7 @@ tls_key_file = "" [p2p] # Address to listen for incoming connections -laddr = "tcp://0.0.0.0:36656" +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, diff --git a/tm2/pkg/p2p/config/config.go b/tm2/pkg/p2p/config/config.go index a0ed2d39381..48aae35e10a 100644 --- a/tm2/pkg/p2p/config/config.go +++ b/tm2/pkg/p2p/config/config.go @@ -107,7 +107,7 @@ func DefaultP2PConfig() *P2PConfig { // TestP2PConfig returns a configuration for testing the peer-to-peer layer func TestP2PConfig() *P2PConfig { cfg := DefaultP2PConfig() - cfg.ListenAddress = "tcp://0.0.0.0:36656" + cfg.ListenAddress = "tcp://0.0.0.0:26656" cfg.FlushThrottleTimeout = 10 * time.Millisecond cfg.AllowDuplicateIP = true return cfg From 58021fa8795a2e630fb7136b935727e3bc58f363 Mon Sep 17 00:00:00 2001 From: albttx Date: Thu, 23 May 2024 15:42:48 +0100 Subject: [PATCH 3/5] chore: keep test3 36657 for legacy --- misc/deployments/test3.gno.land/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/misc/deployments/test3.gno.land/docker-compose.yml b/misc/deployments/test3.gno.land/docker-compose.yml index 4f27461fdee..62adda7cc3e 100644 --- a/misc/deployments/test3.gno.land/docker-compose.yml +++ b/misc/deployments/test3.gno.land/docker-compose.yml @@ -27,6 +27,7 @@ services: ports: - 26656:26656 - 26657:26657 + - 36657:26657 restart: on-failure logging: driver: "json-file" From 7998cbc8fd93f95b900e098f3b75625f1c7f0a78 Mon Sep 17 00:00:00 2001 From: albttx Date: Thu, 23 May 2024 15:45:11 +0100 Subject: [PATCH 4/5] chore: s/36658/26658/g --- tm2/pkg/bft/rpc/config/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tm2/pkg/bft/rpc/config/config.go b/tm2/pkg/bft/rpc/config/config.go index 5fe130eda9e..de576ddb402 100644 --- a/tm2/pkg/bft/rpc/config/config.go +++ b/tm2/pkg/bft/rpc/config/config.go @@ -112,7 +112,7 @@ func DefaultRPCConfig() *RPCConfig { func TestRPCConfig() *RPCConfig { cfg := DefaultRPCConfig() cfg.ListenAddress = "tcp://0.0.0.0:26657" - cfg.GRPCListenAddress = "tcp://0.0.0.0:36658" + cfg.GRPCListenAddress = "tcp://0.0.0.0:26658" cfg.Unsafe = true return cfg } From 92dffc5719aeda14d8c63d5a3a91f9521029f930 Mon Sep 17 00:00:00 2001 From: albttx Date: Mon, 27 May 2024 12:06:56 +0100 Subject: [PATCH 5/5] fix: typo --- Dockerfile.gnoland.release | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.gnoland.release b/Dockerfile.gnoland.release index 181b71c0bf3..302ad3fde8e 100644 --- a/Dockerfile.gnoland.release +++ b/Dockerfile.gnoland.release @@ -8,6 +8,6 @@ COPY ./gno.land/genesis/genesis_txs.jsonl /gnoroot/gno.land/genesis/genesis_txs. ENV GNOROOT="/gnoroot/" -EXPOSE 26657 26657 +EXPOSE 26656 26657 ENTRYPOINT [ "/gnoland" ] -CMD [ "" ] \ No newline at end of file +CMD [ "" ]