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.

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

chore: replace all occurence of port 3665{6,7,8} to 2665{6,7,8} #2178

Merged
merged 5 commits into from
May 27, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
2 changes: 1 addition & 1 deletion .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ ports:

- name: "gnoland RPC"
description: "the RPC server, managed by tendermint2"
port: 36657
port: 26657
onOpen: notify

github:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.gnoland.release
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ COPY ./gno.land/genesis/genesis_txs.jsonl /gnoroot/gno.land/genesis/genesis_txs.

ENV GNOROOT="/gnoroot/"

EXPOSE 26657 36657
thehowl marked this conversation as resolved.
Show resolved Hide resolved
EXPOSE 26657 26657
ENTRYPOINT [ "/gnoland" ]
CMD [ "" ]
2 changes: 1 addition & 1 deletion contribs/gnodev/cmd/gnodev/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
12 changes: 6 additions & 6 deletions docs/how-to-guides/interact-with-gnoland.md
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand All @@ -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"
```

Expand All @@ -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
Expand All @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/network-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/tm2-js-client/Provider/json-rpc-provider.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
10 changes: 5 additions & 5 deletions docs/reference/tm2-js-client/Provider/ws-provider.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand All @@ -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
Expand All @@ -52,7 +52,7 @@ Returns **Promise<RPCResponse<Result\>>**
```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<Result>(request);
// request is sent over the open WS connection
Expand All @@ -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<Result>(response);
// response is parsed
Expand All @@ -88,7 +88,7 @@ Returns **Promise<null\>**
#### 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
Expand Down
2 changes: 1 addition & 1 deletion examples/gno.land/r/demo/boards/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion gnovm/cmd/gno/mod.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)

Expand Down
2 changes: 1 addition & 1 deletion gnovm/pkg/gnomod/file_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"golang.org/x/mod/module"
)

const testRemote string = "test3.gno.land:36657"
const testRemote string = "test3.gno.land:26657"
thehowl marked this conversation as resolved.
Show resolved Hide resolved

func TestFetchDeps(t *testing.T) {
for _, tc := range []struct {
Expand Down
14 changes: 7 additions & 7 deletions misc/deployments/staging.gno.land/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
- 26656:26656
- 26657:26657
restart: on-failure
logging:
driver: "json-file"
Expand All @@ -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"
Expand All @@ -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
"
Expand Down
4 changes: 2 additions & 2 deletions misc/deployments/staging.gno.land/overlay/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions misc/deployments/test2.gno.land/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 7 additions & 7 deletions misc/deployments/test2.gno.land/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -16,15 +16,15 @@ services:
- --chainid
- test2
- --genesis-remote
- test2.gno.land:36657
- test2.gno.land:26657
- --genesis-balances-file
- /overlay/balances.txt
volumes:
- "./data/gnoland:/opt/gno/src/testdir"
- "./overlay:/overlay:ro"
ports:
- 36656:36656
- 36657:36657
- 26656:26656
- 26657:26657
restart: on-failure
logging:
driver: "json-file"
Expand All @@ -40,15 +40,15 @@ services:
- --bind
- 0.0.0.0:80
- --remote
- gnoland:36657
- gnoland:26657
- --captcha-site
- $RECAPTCHA_SITE_KEY
- --faucet-url
- https://faucet.test2.gno.land/
- --help-chainid
- test2
- --help-remote
- test2.gno.land:36657
- test2.gno.land:26657
- --home-content
- /overlay/HOME.md
volumes:
Expand All @@ -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
"
Expand Down
4 changes: 2 additions & 2 deletions misc/deployments/test2.gno.land/overlay/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions misc/deployments/test3.gno.land/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
15 changes: 8 additions & 7 deletions misc/deployments/test3.gno.land/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -25,8 +25,9 @@ services:
- "./data/gnoland:/opt/gno/src/testdir"
- "./overlay:/overlay:ro"
ports:
- 36656:36656
- 36657:36657
- 26656:26656
- 26657:26657
- 36657:26657
restart: on-failure
logging:
driver: "json-file"
Expand All @@ -42,15 +43,15 @@ services:
- --bind
- 0.0.0.0:80
- --remote
- gnoland:36657
- gnoland:26657
- --captcha-site
- $RECAPTCHA_SITE_KEY
- --faucet-url
- https://faucet.test3.gno.land/
- --help-chainid
- test3
- --help-remote
- test3.gno.land:36657
- test3.gno.land:26657
- --home-content
- /overlay/HOME.md
volumes:
Expand All @@ -77,7 +78,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
"
Expand Down
4 changes: 2 additions & 2 deletions misc/deployments/test3.gno.land/overlay/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
Loading
Loading