From 60c2314720c94d50e21c8d069812c7c751901dc6 Mon Sep 17 00:00:00 2001 From: "Dmitry K." Date: Tue, 21 May 2024 08:35:09 -0700 Subject: [PATCH 1/6] use default cosmos ports --- .../run-e2e-test-job-template.yaml | 4 +- .github/workflows-helpers/run-e2e-test.sh | 6 +- .github/workflows/main-build.yml | 2 +- Makefile | 2 +- Tiltfile | 14 +-- .../develop/developer_guide/quickstart.md | 32 +++---- .../docs/develop/packages/client_events.md | 2 +- .../operate/configs/app_staking_config.md | 2 +- .../operate/configs/gateway_staking_config.md | 2 +- .../configs/supplier_staking_config.md | 2 +- e2e/tests/node.go | 2 +- .../tests/relays_stress_helpers_test.go | 4 +- localnet/kubernetes/values-appgateserver.yaml | 4 +- localnet/kubernetes/values-gateway.yaml | 4 +- .../kubernetes/values-relayminer-common.yaml | 6 +- .../config/appgate_server_config.yaml | 4 +- .../config/appgate_server_config_example.yaml | 4 +- ...appgate_server_config_localnet_vscode.yaml | 4 +- .../poktrolld/config/relayminer_config.yaml | 6 +- .../relayminer_config_full_example.yaml | 6 +- .../config/appgate_configs_reader_test.go | 36 ++++---- .../events/replay_client_example_test.go | 2 +- .../config/relayminer_configs_reader_test.go | 86 +++++++++---------- testutil/testclient/localnet.go | 4 +- 24 files changed, 120 insertions(+), 120 deletions(-) diff --git a/.github/workflows-helpers/run-e2e-test-job-template.yaml b/.github/workflows-helpers/run-e2e-test-job-template.yaml index f31d86503..0f41101e1 100644 --- a/.github/workflows-helpers/run-e2e-test-job-template.yaml +++ b/.github/workflows-helpers/run-e2e-test-job-template.yaml @@ -28,9 +28,9 @@ spec: go test -v ./e2e/tests/... -tags=e2e env: - name: POCKET_NODE - value: tcp://${NAMESPACE}-validator-poktrolld:36657 + value: tcp://${NAMESPACE}-validator-poktrolld:26657 - name: VALIDATOR_RPC_ENDPOINT - value: ${NAMESPACE}-validator-poktrolld:36657 + value: ${NAMESPACE}-validator-poktrolld:26657 - name: E2E_DEBUG_OUTPUT value: "false" # Flip to true to see the command and result of the execution - name: POKTROLLD_HOME diff --git a/.github/workflows-helpers/run-e2e-test.sh b/.github/workflows-helpers/run-e2e-test.sh index 8a5143496..c7af7664e 100644 --- a/.github/workflows-helpers/run-e2e-test.sh +++ b/.github/workflows-helpers/run-e2e-test.sh @@ -36,11 +36,11 @@ done # Check we can reach the validator endpoint echo "Checking HTTP status for the validator endpoint..." -HTTP_STATUS=$(curl -s -o /dev/null -w '%{http_code}' http://${NAMESPACE}-validator-poktrolld:36657) +HTTP_STATUS=$(curl -s -o /dev/null -w '%{http_code}' http://${NAMESPACE}-validator-poktrolld:26657) if [[ "${HTTP_STATUS}" -eq 200 ]]; then - echo "HTTP request to ${NAMESPACE}-validator-poktrolld:36657 returned 200 OK." + echo "HTTP request to ${NAMESPACE}-validator-poktrolld:26657 returned 200 OK." else - echo "HTTP request to ${NAMESPACE}-validator-poktrolld:36657 did not return 200 OK. Status code: ${HTTP_STATUS}. Retrying in 10 seconds..." + echo "HTTP request to ${NAMESPACE}-validator-poktrolld:26657 did not return 200 OK. Status code: ${HTTP_STATUS}. Retrying in 10 seconds..." sleep 10 fi diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml index ba60c567a..0398f8f34 100644 --- a/.github/workflows/main-build.yml +++ b/.github/workflows/main-build.yml @@ -114,5 +114,5 @@ jobs: IMAGE_TAG: sha-${{ github.event.pull_request.head.sha || github.sha }} NAMESPACE: devnet-issue-${{ github.event.number }} JOB_NAME: e2e-test-${{ github.event.pull_request.head.sha || github.sha }} - POCKET_NODE: tcp://devnet-issue-${{ github.event.number }}-validator-poktrolld:36657 + POCKET_NODE: tcp://devnet-issue-${{ github.event.number }}-validator-poktrolld:26657 run: bash .github/workflows-helpers/run-e2e-test.sh diff --git a/Makefile b/Makefile index f6101552f..e5c5882f2 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SHELL = /bin/sh POKTROLLD_HOME ?= ./localnet/poktrolld -POCKET_NODE ?= tcp://127.0.0.1:36657 # The pocket node (validator in the localnet context) +POCKET_NODE ?= tcp://127.0.0.1:26657 # The pocket node (validator in the localnet context) TESTNET_RPC ?= https://testnet-validated-validator-rpc.poktroll.com/ # TestNet RPC endpoint for validator maintained by Grove. Needs to be update if there's another "primary" testnet. APPGATE_SERVER ?= http://localhost:42069 GATEWAY_URL ?= http://localhost:42079 diff --git a/Tiltfile b/Tiltfile index 3f1bebd7e..8d89ef0d8 100644 --- a/Tiltfile +++ b/Tiltfile @@ -346,11 +346,11 @@ for x in range(localnet_config["gateways"]["count"]): str(40064 + actor_number) + ":40004", # DLV port. gateway1 - exposes 40065, gateway2 exposes 40066, etc. # Run `curl localhost:PORT` to see the current snapshot of gateway metrics. - str(9089 + actor_number) - + ":9090", # gateway metrics port. gateway1 - exposes 9090, gateway2 exposes 9091, etc. + str(9059 + actor_number) + + ":9090", # gateway metrics port. gateway1 - exposes 9060, gateway2 exposes 9061, etc. # Use with pprof like this: `go tool pprof -http=:3333 http://localhost:6090/debug/pprof/goroutine` - str(6089 + actor_number) - + ":6060", # gateway metrics port. gateway1 - exposes 6090, gateway2 exposes 6091, etc. + str(6059 + actor_number) + + ":6060", # gateway metrics port. gateway1 - exposes 6060, gateway2 exposes 6061, etc. ], ) @@ -358,9 +358,9 @@ k8s_resource( "validator", labels=["pocket_network"], port_forwards=[ - "36657", - "36658", - "40004", + "26657", # RPC + "9090", # the gRPC server address + "40004", # use with `dlv` when it's turned on in `localnet_config.yaml` # Use with pprof like this: `go tool pprof -http=:3333 http://localhost:6061/debug/pprof/goroutine` "6061:6060", ], diff --git a/docusaurus/docs/develop/developer_guide/quickstart.md b/docusaurus/docs/develop/developer_guide/quickstart.md index 1032db52e..dcb4af46a 100644 --- a/docusaurus/docs/develop/developer_guide/quickstart.md +++ b/docusaurus/docs/develop/developer_guide/quickstart.md @@ -176,19 +176,19 @@ you can click in the top left corner to view its [grafana dashboard](http://loca You can query the status of the blockchain using `poktrolld` by running: ```bash -poktrolld status --node=tcp://127.0.0.1:36657 | jq +poktrolld status --node=tcp://127.0.0.1:26657 | jq ``` Alternatively, you use the [CometBFT](https://github.com/cometbft/cometbft) status directly at: ```bash -curl -s -X POST localhost:36657/status | jq +curl -s -X POST localhost:26657/status | jq ``` Or at latest block at: ```bash -curl -s -X POST localhost:36657/block | jq +curl -s -X POST localhost:26657/block | jq ``` For example, you can get the height of the blockchain by visiting the @@ -196,7 +196,7 @@ For example, you can get the height of the blockchain by visiting the or from the CLI like so: ```bash -curl -s -X POST localhost:36657/block | jq '.result.block.last_commit.height' +curl -s -X POST localhost:26657/block | jq '.result.block.last_commit.height' ``` ## 2. Fund New Accounts @@ -276,7 +276,7 @@ You can send some uPOKT to your `shannon_supplier` by running: poktrolld \ tx bank send \ faucet $SHANNON_SUPPLIER 420000000000069upokt \ - --node tcp://127.0.0.1:36657 \ + --node tcp://127.0.0.1:26657 \ --home=./localnet/poktrolld ``` @@ -299,7 +299,7 @@ Let's do the same thing for the `shannon_application`: poktrolld \ tx bank send \ faucet $SHANNON_APPLICATION 420000000000069upokt \ - --node tcp://127.0.0.1:36657 \ + --node tcp://127.0.0.1:26657 \ --home=./localnet/poktrolld ``` @@ -382,7 +382,7 @@ poktrolld \ --config shannon_supplier_config.yaml \ --keyring-backend test \ --from shannon_supplier \ - --node tcp://127.0.0.1:36657 \ + --node tcp://127.0.0.1:26657 \ --home=./localnet/poktrolld \ --yes ``` @@ -390,7 +390,7 @@ poktrolld \ And verify that the supplier is now staked with: ```bash -poktrolld query supplier show-supplier $SHANNON_SUPPLIER --node tcp://127.0.0.1:36657 +poktrolld query supplier show-supplier $SHANNON_SUPPLIER --node tcp://127.0.0.1:26657 ``` ### 3.4 Prepare the RelayMiner configuration @@ -409,9 +409,9 @@ metrics: enabled: true addr: :9090 pocket_node: - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 - tx_node_rpc_url: tcp://127.0.0.1:36657 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 + tx_node_rpc_url: tcp://127.0.0.1:26657 suppliers: - service_id: anvil listen_url: http://localhost:6942 @@ -488,14 +488,14 @@ poktrolld --home=./localnet/poktrolld \ --config shannon_app_config.yaml \ --keyring-backend test \ --from shannon_application \ - --node tcp://127.0.0.1:36657 \ + --node tcp://127.0.0.1:26657 \ --yes ``` And verify that the application is now staked with: ```bash -poktrolld query application show-application $SHANNON_APPLICATION --node tcp://127.0.0.1:36657 +poktrolld query application show-application $SHANNON_APPLICATION --node tcp://127.0.0.1:26657 ``` You can also you re-run, `make app_list` you should see that `SHANNON_APPLICATION` is now staked as an app: @@ -510,8 +510,8 @@ The following example should get you started: ```yaml cat <> shannon_appgate_config.yaml -query_node_rpc_url: tcp://127.0.0.1:36657 -query_node_grpc_url: tcp://127.0.0.1:36658 +query_node_rpc_url: tcp://127.0.0.1:26657 +query_node_grpc_url: tcp://127.0.0.1:9090 self_signing: true signing_key: shannon_application listening_endpoint: http://localhost:42042 @@ -535,7 +535,7 @@ And the start the appgate server locally: poktrolld appgate-server \ --config shannon_appgate_config.yaml \ --keyring-backend test \ - --node tcp://127.0.0.1:36657 \ + --node tcp://127.0.0.1:26657 \ --home=./localnet/poktrolld ``` diff --git a/docusaurus/docs/develop/packages/client_events.md b/docusaurus/docs/develop/packages/client_events.md index 408f60b94..0505912f2 100644 --- a/docusaurus/docs/develop/packages/client_events.md +++ b/docusaurus/docs/develop/packages/client_events.md @@ -280,7 +280,7 @@ const ( // And: https://docs.cosmos.network/v0.47/learn/advanced/events#default-events eventQueryString = "message.action='messageActionName'" // Define the websocket URL the EventsQueryClient will subscribe to - cometWebsocketURL = "ws://example.com:36657/websocket" + cometWebsocketURL = "ws://example.com:26657/websocket" // the amount of events we want before they are emitted replayObsBufferSize = 1 ) diff --git a/docusaurus/docs/operate/configs/app_staking_config.md b/docusaurus/docs/operate/configs/app_staking_config.md index 2f2733c99..851999aae 100644 --- a/docusaurus/docs/operate/configs/app_staking_config.md +++ b/docusaurus/docs/operate/configs/app_staking_config.md @@ -38,7 +38,7 @@ poktrolld tx application stake-application \ --config ./stake_config.yaml \ --keyring-backend test \ --from application1 \ - --node tcp://poktroll-node:36657 + --node tcp://poktroll-node:26657 ``` ## Configuration diff --git a/docusaurus/docs/operate/configs/gateway_staking_config.md b/docusaurus/docs/operate/configs/gateway_staking_config.md index b7c0db4cb..90d363b51 100644 --- a/docusaurus/docs/operate/configs/gateway_staking_config.md +++ b/docusaurus/docs/operate/configs/gateway_staking_config.md @@ -37,7 +37,7 @@ poktrolld tx gateway stake-gateway \ --config ./stake_config.yaml \ --keyring-backend test \ --from gateway1 \ - --node tcp://poktroll-node:36657 + --node tcp://poktroll-node:26657 ``` ## Configuration diff --git a/docusaurus/docs/operate/configs/supplier_staking_config.md b/docusaurus/docs/operate/configs/supplier_staking_config.md index 900fbb85c..1bd9afde0 100644 --- a/docusaurus/docs/operate/configs/supplier_staking_config.md +++ b/docusaurus/docs/operate/configs/supplier_staking_config.md @@ -38,7 +38,7 @@ poktrolld tx supplier stake-supplier \ --config ./stake_config.yaml \ --keyring-backend test \ --from supplier1 \ - --node tcp://poktroll-node:36657 + --node tcp://poktroll-node:26657 ``` ## Configuration diff --git a/e2e/tests/node.go b/e2e/tests/node.go index f7d2c86d6..de7f55411 100644 --- a/e2e/tests/node.go +++ b/e2e/tests/node.go @@ -16,7 +16,7 @@ var ( // defaultRPCURL used by pocketdBin to run remote commands defaultRPCURL = os.Getenv("POCKET_NODE") // defaultRPCPort is the default RPC port that pocketd listens on - defaultRPCPort = 36657 + defaultRPCPort = 26657 // defaultRPCHost is the default RPC host that pocketd listens on defaultRPCHost = "127.0.0.1" // defaultHome is the default home directory for pocketd diff --git a/load-testing/tests/relays_stress_helpers_test.go b/load-testing/tests/relays_stress_helpers_test.go index 0292d1841..98d935ce2 100644 --- a/load-testing/tests/relays_stress_helpers_test.go +++ b/load-testing/tests/relays_stress_helpers_test.go @@ -861,7 +861,7 @@ func (s *relaysSuite) sendStakeGatewaysTxs( // signWithRetries signs the transaction with the keyName provided, retrying // up to maxRetries times if the signing fails. // TODO_INVESTIGATE: SignTx randomly fails at retrieving the account info with -// the error post failed: Post "http://localhost:36657": EOF. This might be due to +// the error post failed: Post "http://localhost:26657": EOF. This might be due to // concurrent requests trying to access the same account info and needs to be investigated. func (s *relaysSuite) signWithRetries( actorKeyName string, @@ -895,7 +895,7 @@ func (s *relaysSuite) sendPendingMsgsTx(actor *accountInfo) { txBuilder.SetGasLimit(690000042) // TODO_HACK: Sometimes SignTx fails at retrieving the account info with - // the error post failed: Post "http://localhost:36657": EOF. + // the error post failed: Post "http://localhost:26657": EOF. // A retry mechanism is added to avoid this issue. err = s.signWithRetries(actor.keyName, txBuilder, signTxMaxRetries) require.NoError(s, err) diff --git a/localnet/kubernetes/values-appgateserver.yaml b/localnet/kubernetes/values-appgateserver.yaml index dd6400ae1..1375175b4 100644 --- a/localnet/kubernetes/values-appgateserver.yaml +++ b/localnet/kubernetes/values-appgateserver.yaml @@ -1,6 +1,6 @@ config: - query_node_rpc_url: tcp://validator-poktroll-validator:36657 - query_node_grpc_url: tcp://validator-poktroll-validator:36658 + query_node_rpc_url: tcp://validator-poktroll-validator:26657 + query_node_grpc_url: tcp://validator-poktroll-validator:9090 metrics: enabled: true addr: :9090 diff --git a/localnet/kubernetes/values-gateway.yaml b/localnet/kubernetes/values-gateway.yaml index 3560905dc..fe4d46d79 100644 --- a/localnet/kubernetes/values-gateway.yaml +++ b/localnet/kubernetes/values-gateway.yaml @@ -1,6 +1,6 @@ config: - query_node_rpc_url: tcp://validator-poktroll-validator:36657 - query_node_grpc_url: tcp://validator-poktroll-validator:36658 + query_node_rpc_url: tcp://validator-poktroll-validator:26657 + query_node_grpc_url: tcp://validator-poktroll-validator:9090 self_signing: false metrics: enabled: true diff --git a/localnet/kubernetes/values-relayminer-common.yaml b/localnet/kubernetes/values-relayminer-common.yaml index a8070be01..579e5802a 100644 --- a/localnet/kubernetes/values-relayminer-common.yaml +++ b/localnet/kubernetes/values-relayminer-common.yaml @@ -4,9 +4,9 @@ config: enabled: true addr: :9090 pocket_node: - query_node_rpc_url: tcp://validator-poktroll-validator:36657 - query_node_grpc_url: tcp://validator-poktroll-validator:36658 - tx_node_rpc_url: tcp://validator-poktroll-validator:36657 + query_node_rpc_url: tcp://validator-poktroll-validator:26657 + query_node_grpc_url: tcp://validator-poktroll-validator:9090 + tx_node_rpc_url: tcp://validator-poktroll-validator:26657 suppliers: [] pprof: enabled: true diff --git a/localnet/poktrolld/config/appgate_server_config.yaml b/localnet/poktrolld/config/appgate_server_config.yaml index 146528551..16c48b79c 100644 --- a/localnet/poktrolld/config/appgate_server_config.yaml +++ b/localnet/poktrolld/config/appgate_server_config.yaml @@ -1,5 +1,5 @@ -query_node_rpc_url: tcp://poktroll-validator:36657 -query_node_grpc_url: tcp://poktroll-validator:36658 +query_node_rpc_url: tcp://poktroll-validator:26657 +query_node_grpc_url: tcp://poktroll-validator:9090 signing_key: app1 self_signing: true listening_endpoint: http://localhost:42069 diff --git a/localnet/poktrolld/config/appgate_server_config_example.yaml b/localnet/poktrolld/config/appgate_server_config_example.yaml index c14a15b83..8c93c006c 100644 --- a/localnet/poktrolld/config/appgate_server_config_example.yaml +++ b/localnet/poktrolld/config/appgate_server_config_example.yaml @@ -1,8 +1,8 @@ # Pocket node URL that exposes CometBFT JSON-RPC API. # This can be used by the Cosmos client SDK, event subscriptions, etc... -query_node_rpc_url: tcp://poktroll-validator:36657 +query_node_rpc_url: tcp://poktroll-validator:26657 # Pocket node URL that exposes the Cosmos gRPC service, dedicated to querying purposes. -query_node_grpc_url: tcp://poktroll-validator:36658 +query_node_grpc_url: tcp://poktroll-validator:9090 # The name of the key (in the keyring) that will be used to sign relays signing_key: app1 # Whether the server should sign all incoming requests with its own ring (for applications) diff --git a/localnet/poktrolld/config/appgate_server_config_localnet_vscode.yaml b/localnet/poktrolld/config/appgate_server_config_localnet_vscode.yaml index cc3aa6bb0..7c7e475da 100644 --- a/localnet/poktrolld/config/appgate_server_config_localnet_vscode.yaml +++ b/localnet/poktrolld/config/appgate_server_config_localnet_vscode.yaml @@ -1,5 +1,5 @@ -query_node_rpc_url: tcp://localhost:36657 -query_node_grpc_url: tcp://localhost:36658 +query_node_rpc_url: tcp://localhost:26657 +query_node_grpc_url: tcp://localhost:9090 signing_key: app1 self_signing: true listening_endpoint: http://0.0.0.0:42069 diff --git a/localnet/poktrolld/config/relayminer_config.yaml b/localnet/poktrolld/config/relayminer_config.yaml index 6ddf220e9..236425e1e 100644 --- a/localnet/poktrolld/config/relayminer_config.yaml +++ b/localnet/poktrolld/config/relayminer_config.yaml @@ -4,9 +4,9 @@ metrics: enabled: true addr: :9090 pocket_node: - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 - tx_node_rpc_url: tcp://127.0.0.1:36657 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 + tx_node_rpc_url: tcp://127.0.0.1:26657 suppliers: - service_id: anvil listen_url: http://localhost:6942 diff --git a/localnet/poktrolld/config/relayminer_config_full_example.yaml b/localnet/poktrolld/config/relayminer_config_full_example.yaml index 0769acfc2..a266a67c8 100644 --- a/localnet/poktrolld/config/relayminer_config_full_example.yaml +++ b/localnet/poktrolld/config/relayminer_config_full_example.yaml @@ -21,11 +21,11 @@ pocket_node: # Pocket node URL exposing the CometBFT JSON-RPC API. # Used by the Cosmos client SDK, event subscriptions, etc. # If unspecified, defaults to `tx_node_rpc_url`. - query_node_rpc_url: tcp://poktroll-validator:36657 + query_node_rpc_url: tcp://poktroll-validator:26657 # Pocket node URL exposing the Cosmos gRPC service for querying purposes. - query_node_grpc_url: tcp://poktroll-validator:36658 + query_node_grpc_url: tcp://poktroll-validator:9090 # Pocket node URL exposing the CometRPC service. - tx_node_rpc_url: tcp://poktroll-validator:36658 + tx_node_rpc_url: tcp://poktroll-validator:9090 # Suppliers are different services offered on Pocket Network, # proxied through Relay Miner. diff --git a/pkg/appgateserver/config/appgate_configs_reader_test.go b/pkg/appgateserver/config/appgate_configs_reader_test.go index bc2c88472..f1faafa12 100644 --- a/pkg/appgateserver/config/appgate_configs_reader_test.go +++ b/pkg/appgateserver/config/appgate_configs_reader_test.go @@ -26,8 +26,8 @@ func Test_ParseAppGateConfigs(t *testing.T) { desc: "valid: AppGateServer config", inputConfigYAML: ` - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 signing_key: app1 self_signing: true listening_endpoint: http://localhost:42069 @@ -35,8 +35,8 @@ func Test_ParseAppGateConfigs(t *testing.T) { expectedErr: nil, expectedConfig: &config.AppGateServerConfig{ - QueryNodeRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:36657"}, - QueryNodeGRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:36658"}, + QueryNodeRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:26657"}, + QueryNodeGRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:9090"}, SigningKey: "app1", SelfSigning: true, ListeningEndpoint: &url.URL{Scheme: "http", Host: "localhost:42069"}, @@ -46,16 +46,16 @@ func Test_ParseAppGateConfigs(t *testing.T) { desc: "valid: AppGateServer config with undefined self signing", inputConfigYAML: ` - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 signing_key: app1 listening_endpoint: http://localhost:42069 `, expectedErr: nil, expectedConfig: &config.AppGateServerConfig{ - QueryNodeRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:36657"}, - QueryNodeGRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:36658"}, + QueryNodeRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:26657"}, + QueryNodeGRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:9090"}, SigningKey: "app1", SelfSigning: false, ListeningEndpoint: &url.URL{Scheme: "http", Host: "localhost:42069"}, @@ -73,8 +73,8 @@ func Test_ParseAppGateConfigs(t *testing.T) { desc: "invalid: no signing key", inputConfigYAML: ` - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 # NB: explicitly missing signing key self_signing: true listening_endpoint: http://localhost:42069 @@ -86,8 +86,8 @@ func Test_ParseAppGateConfigs(t *testing.T) { desc: "invalid: invalid listening endpoint", inputConfigYAML: ` - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 signing_key: app1 self_signing: true listening_endpoint: l&ocalhost:42069 @@ -99,8 +99,8 @@ func Test_ParseAppGateConfigs(t *testing.T) { desc: "invalid: invalid query node grpc url", inputConfigYAML: ` - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: 1&27.0.0.1:36658 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: 1&27.0.0.1:9090 signing_key: app1 self_signing: true listening_endpoint: http://localhost:42069 @@ -112,7 +112,7 @@ func Test_ParseAppGateConfigs(t *testing.T) { desc: "invalid: missing query node grpc url", inputConfigYAML: ` - query_node_rpc_url: tcp://127.0.0.1:36657 + query_node_rpc_url: tcp://127.0.0.1:26657 # NB: explicitly missing query_node_grpc_url signing_key: app1 self_signing: true @@ -125,8 +125,8 @@ func Test_ParseAppGateConfigs(t *testing.T) { desc: "invalid: invalid query node rpc url", inputConfigYAML: ` - query_node_rpc_url: 1&27.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_rpc_url: 1&27.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 signing_key: app1 self_signing: true listening_endpoint: http://localhost:42069 @@ -139,7 +139,7 @@ func Test_ParseAppGateConfigs(t *testing.T) { inputConfigYAML: ` # NB: explicitly missing query_node_rpc_url - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_grpc_url: tcp://127.0.0.1:9090 signing_key: app1 self_signing: true listening_endpoint: http://localhost:42069 diff --git a/pkg/client/events/replay_client_example_test.go b/pkg/client/events/replay_client_example_test.go index d11685de2..9245cf839 100644 --- a/pkg/client/events/replay_client_example_test.go +++ b/pkg/client/events/replay_client_example_test.go @@ -17,7 +17,7 @@ const ( // And: https://docs.cosmos.network/v0.47/learn/advanced/events#default-events eventQueryString = "message.action='messageActionName'" // Define the websocket URL the EventsQueryClient will subscribe to - cometWebsocketURL = "ws://example.com:36657/websocket" + cometWebsocketURL = "ws://example.com:26657/websocket" // the amount of events we want before they are emitted replayObsBufferSize = 1 ) diff --git a/pkg/relayer/config/relayminer_configs_reader_test.go b/pkg/relayer/config/relayminer_configs_reader_test.go index 472a893f0..64ea04f67 100644 --- a/pkg/relayer/config/relayminer_configs_reader_test.go +++ b/pkg/relayer/config/relayminer_configs_reader_test.go @@ -35,8 +35,8 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { inputConfigYAML: ` pocket_node: - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 tx_node_rpc_url: tcp://127.0.0.1:36659 signing_key_name: supplier1 smt_store_path: smt_stores @@ -57,8 +57,8 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { expectedErr: nil, expectedConfig: &config.RelayMinerConfig{ PocketNode: &config.RelayMinerPocketNodeConfig{ - QueryNodeRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:36657"}, - QueryNodeGRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:36658"}, + QueryNodeRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:26657"}, + QueryNodeGRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:9090"}, TxNodeRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:36659"}, }, SigningKeyName: "supplier1", @@ -95,8 +95,8 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { inputConfigYAML: ` pocket_node: - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 tx_node_rpc_url: tcp://127.0.0.1:36659 signing_key_name: supplier1 smt_store_path: smt_stores @@ -124,8 +124,8 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { expectedErr: nil, expectedConfig: &config.RelayMinerConfig{ PocketNode: &config.RelayMinerPocketNodeConfig{ - QueryNodeRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:36657"}, - QueryNodeGRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:36658"}, + QueryNodeRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:26657"}, + QueryNodeGRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:9090"}, TxNodeRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:36659"}, }, SigningKeyName: "supplier1", @@ -173,7 +173,7 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { inputConfigYAML: ` pocket_node: - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_grpc_url: tcp://127.0.0.1:9090 tx_node_rpc_url: tcp://127.0.0.1:36659 signing_key_name: supplier1 smt_store_path: smt_stores @@ -192,7 +192,7 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { expectedConfig: &config.RelayMinerConfig{ PocketNode: &config.RelayMinerPocketNodeConfig{ QueryNodeRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:36659"}, - QueryNodeGRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:36658"}, + QueryNodeGRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:9090"}, TxNodeRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:36659"}, }, SigningKeyName: "supplier1", @@ -224,8 +224,8 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { inputConfigYAML: ` pocket_node: - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 tx_node_rpc_url: tcp://127.0.0.1:36659 signing_key_name: supplier1 smt_store_path: smt_stores @@ -242,8 +242,8 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { expectedErr: nil, expectedConfig: &config.RelayMinerConfig{ PocketNode: &config.RelayMinerPocketNodeConfig{ - QueryNodeRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:36657"}, - QueryNodeGRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:36658"}, + QueryNodeRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:26657"}, + QueryNodeGRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:9090"}, TxNodeRPCUrl: &url.URL{Scheme: "tcp", Host: "127.0.0.1:36659"}, }, SigningKeyName: "supplier1", @@ -276,8 +276,8 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { inputConfigYAML: ` pocket_node: - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 tx_node_rpc_url: &tcp://127.0.0.1:36659 signing_key_name: supplier1 smt_store_path: smt_stores @@ -297,9 +297,9 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { inputConfigYAML: ` pocket_node: - query_node_rpc_url: tcp://127.0.0.1:36657 + query_node_rpc_url: tcp://127.0.0.1:26657 # explicitly omitted tx node grpc url - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_grpc_url: tcp://127.0.0.1:9090 signing_key_name: supplier1 smt_store_path: smt_stores suppliers: @@ -317,8 +317,8 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { inputConfigYAML: ` pocket_node: - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: &tcp://127.0.0.1:36658 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: &tcp://127.0.0.1:9090 tx_node_rpc_url: tcp://127.0.0.1:36659 signing_key_name: supplier1 smt_store_path: smt_stores @@ -339,8 +339,8 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { inputConfigYAML: ` pocket_node: - query_node_rpc_url: &tcp://127.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_rpc_url: &tcp://127.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 tx_node_rpc_url: tcp://127.0.0.1:36659 signing_key_name: supplier1 smt_store_path: smt_stores @@ -362,7 +362,7 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { inputConfigYAML: ` pocket_node: # explicitly omitted query node rpc url - query_node_rpc_url: tcp://127.0.0.1:36657 + query_node_rpc_url: tcp://127.0.0.1:26657 tx_node_rpc_url: tcp://127.0.0.1:36659 signing_key_name: supplier1 smt_store_path: smt_stores @@ -383,8 +383,8 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { inputConfigYAML: ` pocket_node: - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 tx_node_rpc_url: tcp://127.0.0.1:36659 # explicitly omitted signing key name smt_store_path: smt_stores @@ -405,8 +405,8 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { inputConfigYAML: ` pocket_node: - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 tx_node_rpc_url: tcp://127.0.0.1:36659 signing_key_name: supplier1 # explicitly omitted smt store path @@ -427,8 +427,8 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { inputConfigYAML: ` pocket_node: - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 tx_node_rpc_url: tcp://127.0.0.1:36659 signing_key_name: supplier1 smt_store_path: smt_stores @@ -449,8 +449,8 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { inputConfigYAML: ` pocket_node: - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 tx_node_rpc_url: tcp://127.0.0.1:36659 signing_key_name: supplier1 smt_store_path: smt_stores @@ -470,8 +470,8 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { inputConfigYAML: ` pocket_node: - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 tx_node_rpc_url: tcp://127.0.0.1:36659 signing_key_name: supplier1 smt_store_path: smt_stores @@ -491,8 +491,8 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { inputConfigYAML: ` pocket_node: - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 tx_node_rpc_url: tcp://127.0.0.1:36659 signing_key_name: supplier1 smt_store_path: smt_stores @@ -513,8 +513,8 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { inputConfigYAML: ` pocket_node: - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 tx_node_rpc_url: tcp://127.0.0.1:36659 signing_key_name: supplier1 smt_store_path: smt_stores @@ -535,8 +535,8 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { inputConfigYAML: ` pocket_node: - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 tx_node_rpc_url: tcp://127.0.0.1:36659 signing_key_name: supplier1 smt_store_path: smt_stores @@ -557,8 +557,8 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { inputConfigYAML: ` pocket_node: - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 tx_node_rpc_url: tcp://127.0.0.1:36659 signing_key_name: supplier1 smt_store_path: smt_stores @@ -578,8 +578,8 @@ func Test_ParseRelayMinerConfigs(t *testing.T) { inputConfigYAML: ` pocket_node: - query_node_rpc_url: tcp://127.0.0.1:36657 - query_node_grpc_url: tcp://127.0.0.1:36658 + query_node_rpc_url: tcp://127.0.0.1:26657 + query_node_grpc_url: tcp://127.0.0.1:9090 tx_node_rpc_url: tcp://127.0.0.1:36659 signing_key_name: supplier1 smt_store_path: smt_stores diff --git a/testutil/testclient/localnet.go b/testutil/testclient/localnet.go index 4e751dc49..354a1dd28 100644 --- a/testutil/testclient/localnet.go +++ b/testutil/testclient/localnet.go @@ -21,10 +21,10 @@ import ( var ( // CometLocalTCPURL provides a default URL pointing to the localnet TCP endpoint. - CometLocalTCPURL = "tcp://localhost:36657" + CometLocalTCPURL = "tcp://localhost:26657" // CometLocalWebsocketURL provides a default URL pointing to the localnet websocket endpoint. - CometLocalWebsocketURL = "ws://localhost:36657/websocket" + CometLocalWebsocketURL = "ws://localhost:26657/websocket" // TxConfig provided by app.AppConfig(), intended as a convenience for use in tests. TxConfig client.TxConfig From ed6c6a070c9a070e29752e443658fc217ce18d74 Mon Sep 17 00:00:00 2001 From: "Dmitry K." Date: Fri, 14 Jun 2024 16:20:43 -0700 Subject: [PATCH 2/6] --wip-- [skip ci] --- .env.dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.dev b/.env.dev index e48297659..d40b85238 100644 --- a/.env.dev +++ b/.env.dev @@ -4,7 +4,7 @@ POKTROLLD_HOME=./localnet/poktrolld # The pocket node (validator in the localnet context) -POCKET_NODE=tcp://127.0.0.1:36657 +POCKET_NODE=tcp://127.0.0.1:26657 # TestNet RPC endpoint for validator maintained by Grove. Needs to be updated if there's another "primary" testnet. TESTNET_RPC=https://testnet-validated-validator-rpc.poktroll.com/ APPGATE_SERVER=http://localhost:42069 From 5045565c0171d177901abd17b724119b97f32e6c Mon Sep 17 00:00:00 2001 From: "Dmitry K." Date: Mon, 17 Jun 2024 12:21:01 -0700 Subject: [PATCH 3/6] --wip-- [skip ci] --- Makefile | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index fd6f09352..59d014eff 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,6 @@ TESTNET_RPC ?= https://testnet-validated-validator-rpc.poktroll.com/ # TestNet R APPGATE_SERVER ?= http://localhost:42069 GATEWAY_URL ?= http://localhost:42079 POCKET_ADDR_PREFIX = pokt -CHAIN_ID = poktroll # The domain ending in ".town" is staging, ".city" is production GROVE_GATEWAY_STAGING_ETH_MAINNET = https://eth-mainnet.rpc.grove.town @@ -516,7 +515,7 @@ gateway_list: ## List all the staked gateways .PHONY: gateway_stake gateway_stake: ## Stake tokens for the gateway specified (must specify the gateway env var) - poktrolld --home=$(POKTROLLD_HOME) tx gateway stake-gateway -y --config $(POKTROLLD_HOME)/config/$(STAKE) --keyring-backend test --from $(GATEWAY) --node $(POCKET_NODE) --chain-id $(CHAIN_ID) + poktrolld --home=$(POKTROLLD_HOME) tx gateway stake-gateway -y --config $(POKTROLLD_HOME)/config/$(STAKE) --keyring-backend test --from $(GATEWAY) --node $(POCKET_NODE) .PHONY: gateway1_stake gateway1_stake: ## Stake gateway1 @@ -532,7 +531,7 @@ gateway3_stake: ## Stake gateway3 .PHONY: gateway_unstake gateway_unstake: ## Unstake an gateway (must specify the GATEWAY env var) - poktrolld --home=$(POKTROLLD_HOME) tx gateway unstake-gateway -y --keyring-backend test --from $(GATEWAY) --node $(POCKET_NODE) --chain-id $(CHAIN_ID) + poktrolld --home=$(POKTROLLD_HOME) tx gateway unstake-gateway -y --keyring-backend test --from $(GATEWAY) --node $(POCKET_NODE) .PHONY: gateway1_unstake gateway1_unstake: ## Unstake gateway1 @@ -556,7 +555,7 @@ app_list: ## List all the staked applications .PHONY: app_stake app_stake: ## Stake tokens for the application specified (must specify the APP and SERVICES env vars) - poktrolld --home=$(POKTROLLD_HOME) tx application stake-application -y --config $(POKTROLLD_HOME)/config/$(SERVICES) --keyring-backend test --from $(APP) --node $(POCKET_NODE) --chain-id $(CHAIN_ID) + poktrolld --home=$(POKTROLLD_HOME) tx application stake-application -y --config $(POKTROLLD_HOME)/config/$(SERVICES) --keyring-backend test --from $(APP) --node $(POCKET_NODE) .PHONY: app1_stake app1_stake: ## Stake app1 (also staked in genesis) @@ -572,7 +571,7 @@ app3_stake: ## Stake app3 .PHONY: app_unstake app_unstake: ## Unstake an application (must specify the APP env var) - poktrolld --home=$(POKTROLLD_HOME) tx application unstake-application -y --keyring-backend test --from $(APP) --node $(POCKET_NODE) --chain-id $(CHAIN_ID) + poktrolld --home=$(POKTROLLD_HOME) tx application unstake-application -y --keyring-backend test --from $(APP) --node $(POCKET_NODE) .PHONY: app1_unstake app1_unstake: ## Unstake app1 @@ -588,7 +587,7 @@ app3_unstake: ## Unstake app3 .PHONY: app_delegate app_delegate: ## Delegate trust to a gateway (must specify the APP and GATEWAY_ADDR env vars). Requires the app to be staked - poktrolld --home=$(POKTROLLD_HOME) tx application delegate-to-gateway $(GATEWAY_ADDR) --keyring-backend test --from $(APP) --node $(POCKET_NODE) --chain-id $(CHAIN_ID) + poktrolld --home=$(POKTROLLD_HOME) tx application delegate-to-gateway $(GATEWAY_ADDR) --keyring-backend test --from $(APP) --node $(POCKET_NODE) .PHONY: app1_delegate_gateway1 app1_delegate_gateway1: ## Delegate trust to gateway1 @@ -607,7 +606,7 @@ app3_delegate_gateway3: ## Delegate trust to gateway3 .PHONY: app_undelegate app_undelegate: ## Undelegate trust to a gateway (must specify the APP and GATEWAY_ADDR env vars). Requires the app to be staked - poktrolld --home=$(POKTROLLD_HOME) tx application undelegate-from-gateway $(GATEWAY_ADDR) --keyring-backend test --from $(APP) --node $(POCKET_NODE) --chain-id $(CHAIN_ID) + poktrolld --home=$(POKTROLLD_HOME) tx application undelegate-from-gateway $(GATEWAY_ADDR) --keyring-backend test --from $(APP) --node $(POCKET_NODE) .PHONY: app1_undelegate_gateway1 app1_undelegate_gateway1: ## Undelegate trust to gateway1 @@ -634,7 +633,7 @@ supplier_list: ## List all the staked supplier .PHONY: supplier_stake supplier_stake: ## Stake tokens for the supplier specified (must specify the SUPPLIER and SUPPLIER_CONFIG env vars) - poktrolld --home=$(POKTROLLD_HOME) tx supplier stake-supplier -y --config $(POKTROLLD_HOME)/config/$(SERVICES) --keyring-backend test --from $(SUPPLIER) --node $(POCKET_NODE) --chain-id $(CHAIN_ID) + poktrolld --home=$(POKTROLLD_HOME) tx supplier stake-supplier -y --config $(POKTROLLD_HOME)/config/$(SERVICES) --keyring-backend test --from $(SUPPLIER) --node $(POCKET_NODE) .PHONY: supplier1_stake supplier1_stake: ## Stake supplier1 (also staked in genesis) @@ -650,7 +649,7 @@ supplier3_stake: ## Stake supplier3 .PHONY: supplier_unstake supplier_unstake: ## Unstake an supplier (must specify the SUPPLIER env var) - poktrolld --home=$(POKTROLLD_HOME) tx supplier unstake-supplier --keyring-backend test --from $(SUPPLIER) --node $(POCKET_NODE) --chain-id $(CHAIN_ID) + poktrolld --home=$(POKTROLLD_HOME) tx supplier unstake-supplier --keyring-backend test --from $(SUPPLIER) --node $(POCKET_NODE) .PHONY: supplier1_unstake supplier1_unstake: ## Unstake supplier1 @@ -769,8 +768,7 @@ acc_initialize_pubkeys: ## Make sure the account keeper has public keys for all $(addr) $(PNF_ADDRESS) 1000upokt \ --yes \ --home=$(POKTROLLD_HOME) \ - --node $(POCKET_NODE) \ - --chain-id $(CHAIN_ID);) + --node $(POCKET_NODE);) ######################## ### Warning Messages ### From d72a4dc5ae4babd98cc420d1b6b5d5db8bc16561 Mon Sep 17 00:00:00 2001 From: "Dmitry K." Date: Mon, 17 Jun 2024 14:18:23 -0700 Subject: [PATCH 4/6] Empty commit From 9a2e326f630aaf48e88c81c7ff79eeab9f82f438 Mon Sep 17 00:00:00 2001 From: "Dmitry K." Date: Thu, 20 Jun 2024 17:21:14 -0700 Subject: [PATCH 5/6] add todo_techdebt to unblock 2+ relayminers --- localnet/kubernetes/values-relayminer-1.yaml | 4 ++++ localnet/kubernetes/values-relayminer-2.yaml | 4 ++++ localnet/kubernetes/values-relayminer-3.yaml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/localnet/kubernetes/values-relayminer-1.yaml b/localnet/kubernetes/values-relayminer-1.yaml index d9e57ce77..18d1c759a 100644 --- a/localnet/kubernetes/values-relayminer-1.yaml +++ b/localnet/kubernetes/values-relayminer-1.yaml @@ -1,4 +1,8 @@ config: + # TODO_TECHDEBT(@okdas): remove `signing_key_name` - which is currently present + # for backwards-compatibity with the current helm-chart. + signing_key_name: supplier1 + default_signing_key_names: [supplier1] suppliers: - service_id: anvil diff --git a/localnet/kubernetes/values-relayminer-2.yaml b/localnet/kubernetes/values-relayminer-2.yaml index 6c46cc270..de12138d4 100644 --- a/localnet/kubernetes/values-relayminer-2.yaml +++ b/localnet/kubernetes/values-relayminer-2.yaml @@ -1,4 +1,8 @@ config: + # TODO_TECHDEBT(@okdas): remove `signing_key_name` - which is currently present + # for backwards-compatibity with the current helm-chart. + signing_key_name: supplier2 + default_signing_key_names: [supplier2] suppliers: - service_id: anvil diff --git a/localnet/kubernetes/values-relayminer-3.yaml b/localnet/kubernetes/values-relayminer-3.yaml index 3a89aa079..624aaa1bf 100644 --- a/localnet/kubernetes/values-relayminer-3.yaml +++ b/localnet/kubernetes/values-relayminer-3.yaml @@ -1,4 +1,8 @@ config: + # TODO_TECHDEBT(@okdas): remove `signing_key_name` - which is currently present + # for backwards-compatibity with the current helm-chart. + signing_key_name: supplier3 + default_signing_key_names: [supplier3] suppliers: - service_id: anvil From d8e982946a57fd886cabca439ce84156135554d9 Mon Sep 17 00:00:00 2001 From: "Dmitry K." Date: Thu, 20 Jun 2024 17:45:10 -0700 Subject: [PATCH 6/6] use 36657 on DevNets to avoid dev interruptions --- .github/workflows-helpers/run-e2e-test-job-template.yaml | 4 ++-- .github/workflows/main-build.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows-helpers/run-e2e-test-job-template.yaml b/.github/workflows-helpers/run-e2e-test-job-template.yaml index 1efdfe5fb..76c873883 100644 --- a/.github/workflows-helpers/run-e2e-test-job-template.yaml +++ b/.github/workflows-helpers/run-e2e-test-job-template.yaml @@ -42,9 +42,9 @@ spec: go test -v ./e2e/tests/... -tags=e2e env: - name: POCKET_NODE - value: tcp://${NAMESPACE}-validator-poktrolld:26657 + value: tcp://${NAMESPACE}-validator-poktrolld:36657 - name: VALIDATOR_RPC_ENDPOINT - value: ${NAMESPACE}-validator-poktrolld:26657 + value: ${NAMESPACE}-validator-poktrolld:36657 - name: E2E_DEBUG_OUTPUT value: "false" # Flip to true to see the command and result of the execution - name: POKTROLLD_HOME diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml index c55bd8dda..bbb9e7681 100644 --- a/.github/workflows/main-build.yml +++ b/.github/workflows/main-build.yml @@ -118,5 +118,5 @@ jobs: IMAGE_TAG: sha-${{ github.event.pull_request.head.sha || github.sha }} NAMESPACE: devnet-issue-${{ github.event.number }} JOB_NAME: e2e-test-${{ github.event.pull_request.head.sha || github.sha }} - POCKET_NODE: tcp://devnet-issue-${{ github.event.number }}-validator-poktrolld:26657 + POCKET_NODE: tcp://devnet-issue-${{ github.event.number }}-validator-poktrolld:36657 run: bash .github/workflows-helpers/run-e2e-test.sh