[Migration] FINAL v0.47.x ==> v0.50.x

.github/workflows/main-build.yml

@@ -17,8 +17,8 @@ jobs:
         # TODO_TECHDEBT: upgrade to the latest Ignite (the latest at the moment of creating a note is 0.28). Need to downgrade to fix CI pipelines. Might be done in scope of #240.
         run: |
           # curl https://get.ignite.com/cli! | bash
-          wget https://github.com/ignite/cli/releases/download/v0.27.2/ignite_0.27.2_linux_amd64.tar.gz
-          tar -xzf ignite_0.27.2_linux_amd64.tar.gz
+          wget https://github.com/ignite/cli/releases/download/v28.2.0/ignite_28.2.0_linux_amd64.tar.gz
+          tar -xzf ignite_28.2.0_linux_amd64.tar.gz
           sudo mv ignite /usr/local/bin/ignite
           ignite version
 
@@ -29,7 +29,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20.10"
+          go-version: "1.21.6"
 
       - name: Install CI dependencies
         run: make install_ci_deps
@@ -103,11 +103,11 @@ jobs:
           sparse-checkout: |
             .github
 
-      - id: 'auth'
-        name: 'Authenticate to Google Cloud'
-        uses: 'google-github-actions/auth@v1'
+      - id: "auth"
+        name: "Authenticate to Google Cloud"
+        uses: "google-github-actions/auth@v1"
         with:
-          credentials_json: '${{ secrets.GKE_PROTOCOL_US_CENTRAL }}'
+          credentials_json: "${{ secrets.GKE_PROTOCOL_US_CENTRAL }}"
 
       - uses: google-github-actions/get-gke-credentials@v1
         with:

.github/workflows/reviewdog.yml

@@ -69,3 +69,5 @@ jobs:
           reporter: github-check
           level: warning
           locale: "US"
+
+# TODO_IMPROVE: Enforce using k.Logger() when logging in the `x/` directory code.

.github/workflows/run-tests.yml

@@ -21,8 +21,8 @@ jobs:
         # TODO_TECHDEBT: upgrade to the latest Ignite (the latest at the moment of creating a note is 0.28). Need to downgrade to fix CI pipelines. Might be done in scope of #240.
         run: |
           # curl https://get.ignite.com/cli! | bash
-          wget https://github.com/ignite/cli/releases/download/v0.27.2/ignite_0.27.2_linux_amd64.tar.gz
-          tar -xzf ignite_0.27.2_linux_amd64.tar.gz
+          wget https://github.com/ignite/cli/releases/download/v28.2.0/ignite_28.2.0_linux_amd64.tar.gz
+          tar -xzf ignite_28.2.0_linux_amd64.tar.gz
           sudo mv ignite /usr/local/bin/ignite
           ignite version
 
@@ -33,7 +33,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20.10"
+          go-version: "1.21.6"
 
       - name: Install CI dependencies
         run: make install_ci_deps

.gitignore

@@ -49,10 +49,6 @@ localnet/*/config/*.json
 # Frontend utils
 ts-client/
 
-# Proto artifacts
-**/*.pb.go
-**/*.pb.gw.go
-
 # Mock
 **/*_mock.go
 
@@ -64,6 +60,10 @@ localnet_config.yaml
 # `docusaurus/docs/infrastructure/localnet.md`, please do!
 # Ref: https://stackoverflow.com/questions/4247068/sed-command-with-i-option-failing-on-mac-but-works-on-linux
 localnet_config.yaml-e
+# These are needed to ignore byproducts of `make proto_fix_self_import`
+# Since sed functions different on macOS and Linux, we need to implement
+# some workarounds by always using "sed -i'' -e" instead of just "sed -i -e".
+api/poktroll/**/*.go-E
 
 # Relase artifacts produced by `ignite chain build --release`
 release

.tool-versions

@@ -1,4 +1,4 @@
 # Run `asdf plugin add golang` and `asdf install` to install the dependencies,
 # and `asdf current` to switch to the versions of dependencies listed below
-golang 1.20.10
-go 1.20.10
+golang 1.21.6
+go 1.21.6

Dockerfile.dev

@@ -1,12 +1,12 @@
 # This Dockerfile is used to build container image for development purposes.
 # It intentionally contains no security features, ships with code and troubleshooting tools.
 
-FROM golang:1.20 as base
+FROM golang:1.21.6 as base
 
 RUN apt update && \
     apt-get install -y \
-        ca-certificates net-tools kubernetes-client \
-        curl jq make vim less dnsutils
+    ca-certificates net-tools kubernetes-client \
+    curl jq make vim less dnsutils
 
 # enable faster module downloading.
 ENV GOPROXY https://proxy.golang.org

Makefile

@@ -5,6 +5,7 @@ POKTROLLD_HOME ?= ./localnet/poktrolld
 POCKET_NODE ?= tcp://127.0.0.1:36657 # The pocket rollup node (full node and sequencer in the localnet context)
 APPGATE_SERVER ?= http://localhost:42069
 POCKET_ADDR_PREFIX = pokt
+CHAIN_ID = poktroll
 
 ####################
 ### Dependencies ###
@@ -17,6 +18,7 @@ install_ci_deps: ## Installs `mockgen` and other go tools
 	go install "github.com/golang/mock/[email protected]" && mockgen --version
 	go install github.com/golangci/golangci-lint/cmd/[email protected] && golangci-lint --version
 	go install golang.org/x/tools/cmd/goimports@latest
+	go install github.com/mikefarah/yq/v4@latest
 
 ########################
 ### Makefile Helpers ###
@@ -51,11 +53,20 @@ check_go_version:
 	MAJOR_VERSION=$$(echo $$GO_VERSION | cut -d "." -f 1) && \
 	MINOR_VERSION=$$(echo $$GO_VERSION | cut -d "." -f 2) && \
 	\
-	if [ "$$MAJOR_VERSION" -ne 1 ] || [ "$$MINOR_VERSION" -ge 21 ] ||  [ "$$MINOR_VERSION" -le 18 ] ; then \
-		echo "Invalid Go version. Expected 1.19.x or 1.20.x but found $$GO_VERSION"; \
+	if [ "$$MAJOR_VERSION" -ne 1 ] || [ "$$MINOR_VERSION" -le 20 ] ; then \
+		echo "Invalid Go version. Expected 1.21.x or newer but found $$GO_VERSION"; \
 		exit 1; \
 	fi
 
+.PHONY: check_ignite_version
+# Internal helper target - check ignite version
+check_ignite_version:
+	@version=$$(ignite version 2>/dev/null | grep 'Ignite CLI version:' | awk '{print $$4}') ; \
+	if [ "$$(printf "v28\n$$version" | sort -V | head -n1)" != "v28" ]; then \
+		echo "Error: Version $$version is less than v28. Exiting with error." ; \
+		exit 1 ; \
+	fi
+
 .PHONY: check_act
 # Internal helper target - check if `act` is installed
 check_act:
@@ -76,7 +87,6 @@ check_gh:
 	fi; \
 	}
 
-
 .PHONY: check_docker
 # Internal helper target - check if docker is installed
 check_docker:
@@ -117,6 +127,15 @@ check_jq:
 	fi; \
 	}
 
+.PHONY: check_yq
+# Internal helper target - check if `yq` is installed
+check_yq:
+	{ \
+	if ( ! ( command -v yq >/dev/null )); then \
+		echo "Seems like you don't have `yq` installed. Make sure you install it before continuing"; \
+		exit 1; \
+	fi; \
+	}
 
 .PHONY: check_node
 # Internal helper target - check if node is installed
@@ -137,11 +156,40 @@ warn_destructive: ## Print WARNING to the user
 ### Proto  Helpers ####
 #######################
 
-.PHONY: proto_regen
-proto_regen: ## Delete existing protobuf artifacts and regenerate them
-	find . \( -name "*.pb.go" -o -name "*.pb.gw.go" \) | xargs --no-run-if-empty rm
+.PHONY: proto_ignite_gen
+proto_ignite_gen: ## Generate protobuf artifacts using ignite
 	ignite generate proto-go --yes
 
+# TODO_IN_THIS_PR: Understand why Olshansky needs to run `gco api/poktroll/application/genesis.pulsar.go api/poktroll/application/query.pulsar.go api/poktroll/session/query.pulsar.go`
+# TODO_IN_THIS_PR: Filter for `*.go` files
+.PHONY: proto_fix_self_import
+proto_fix_self_import: ## TODO_IN_THIS_PR: explain
+	@for dir in $(wildcard ./api/poktroll/*/); do \
+			module=$$(basename $$dir); \
+			echo "Processing module $$module"; \
+			ggrep -lRP '\s+'$$module' "github.com/pokt-network/poktroll/api/poktroll/'$$module'"' ./api/poktroll/$$module | while read -r file; do \
+				echo "Modifying file: $$file"; \
+				gsed -i'' -E 's,^[[:space:]]+'$$module'[[:space:]]+"github.com/pokt-network/poktroll/api/poktroll/'$$module'",,' "$$file"; \
+				gsed -i 's,'$$module'\.,,g' "$$file"; \
+			done; \
+	done
+
+.PHONY: proto_clean
+proto_clean: ## Delete existing .pb.go or .pb.gw.go files
+	find . \( -name "*.pb.go" -o -name "*.pb.gw.go" \) | xargs --no-run-if-empty rm
+
+# TODO_IN_THIS_PR: Can we consolidate this with `proto_clean` and use proper make targets instead of $(MAKE)?
+.PHONY: proto_clean_pulsar
+proto_clean_pulsar: ## TODO_IN_THIS_PR: explain...
+	@find ./ -name "*.go" | xargs --no-run-if-empty gsed -i -E 's,(^[[:space:]_[:alnum:]]+"github.com/pokt-network/poktroll/api.+"),///\1,'
+	find ./ -name "*.pulsar.go*" | xargs --no-run-if-empty rm
+	$(MAKE) proto_regen
+	find ./ -name "*.go" | xargs --no-run-if-empty gsed -i -E 's,^///([[:space:]_[:alnum:]]+"github.com/pokt-network/poktroll/api.+"),\1,'
+
+# TODO_IN_THIS_PR: Unclear where/when we shold be calling `proto_clean_pulsar`
+.PHONY: proto_regen
+proto_regen: proto_clean proto_ignite_gen proto_fix_self_import ## Regenerate protobuf artifacts
+
 #######################
 ### Docker  Helpers ###
 #######################
@@ -158,23 +206,38 @@ docker_wipe: check_docker warn_destructive prompt_user ## [WARNING] Remove all t
 ########################
 
 .PHONY: localnet_up
-localnet_up: ## Starts localnet
-	make localnet_regenesis
+localnet_up: proto_regen localnet_regenesis## Starts localnet
 	tilt up
 
 .PHONY: localnet_down
 localnet_down: ## Delete resources created by localnet
 	tilt down
-	kubectl delete secret celestia-secret || exit 1
 
 .PHONY: localnet_regenesis
-localnet_regenesis: acc_initialize_pubkeys_warn_message ## Regenerate the localnet genesis file
+localnet_regenesis: check_yq acc_initialize_pubkeys_warn_message ## Regenerate the localnet genesis file
 # NOTE: intentionally not using --home <dir> flag to avoid overwriting the test keyring
-	ignite chain init
-	mkdir -p $(POKTROLLD_HOME)/config/
-	cp -r ${HOME}/.poktroll/keyring-test $(POKTROLLD_HOME)
-	cp ${HOME}/.poktroll/config/*_key.json $(POKTROLLD_HOME)/config/
-	cp ${HOME}/.poktroll/config/genesis.json $(POKTROLLD_HOME)/config/
+# TODO_TECHDEBT: Currently the stake => power calculation is constant; however, cosmos-sdk
+# intends to make this parameterizable in the future.
+	@echo "Initializing chain..."
+	@set -e ;\
+	ignite chain init --skip-proto ;\
+	mkdir -p $(POKTROLLD_HOME)/config/ ;\
+	cp -r ${HOME}/.poktroll/keyring-test $(POKTROLLD_HOME) ;\
+	cp ${HOME}/.poktroll/config/*_key.json $(POKTROLLD_HOME)/config/ ;\
+	ADDRESS=$$(jq -r '.address' $(POKTROLLD_HOME)/config/priv_validator_key.json) ;\
+	PUB_KEY=$$(jq -r '.pub_key' $(POKTROLLD_HOME)/config/priv_validator_key.json) ;\
+	POWER=$$(yq -r ".validators[0].bonded" ./config.yml | sed 's,000000upokt,,') ;\
+	NAME=$$(yq -r ".validators[0].name" ./config.yml) ;\
+	echo "Regenerating genesis file with new validator..." ;\
+	jq --argjson pubKey "$$PUB_KEY" '.consensus["validators"]=[{"address": "'$$ADDRESS'", "pub_key": $$pubKey, "power": "'$$POWER'", "name": "'$$NAME'"}]' ${HOME}/.poktroll/config/genesis.json > temp.json ;\
+	mv temp.json ${HOME}/.poktroll/config/genesis.json ;\
+	cp ${HOME}/.poktroll/config/genesis.json $(POKTROLLD_HOME)/config/ ;\
+
+.PHONY: send_relay
+send_relay:
+	curl -X POST -H "Content-Type: application/json" \
+	--data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}' \
+	http://localhost:42069/anvil
 
 # TODO_BLOCKER(@okdas): Figure out how to copy these over w/ a functional state.
 # cp ${HOME}/.poktroll/config/app.toml $(POKTROLLD_HOME)/config/app.toml
@@ -231,6 +294,7 @@ go_mockgen: ## Use `mockgen` to generate mocks used for testing purposes of all
 	go generate ./x/supplier/types/
 	go generate ./x/session/types/
 	go generate ./x/service/types/
+	go generate ./x/proof/types/
 	go generate ./x/tokenomics/types/
 	go generate ./pkg/client/interface.go
 	go generate ./pkg/miner/interface.go
@@ -246,13 +310,14 @@ go_testgen_accounts: ## Generate test accounts for usage in test environments
 	go generate ./testutil/testkeyring/keyring.go
 
 .PHONY: go_develop
-go_develop: proto_regen go_mockgen ## Generate protos and mocks
+go_develop: check_ignite_version proto_regen go_mockgen ## Generate protos and mocks
 
+## TODO_IN_THIS_PR: Make this work again
 .PHONY: go_develop_and_test
 go_develop_and_test: go_develop go_test ## Generate protos, mocks and run all tests
 
 .PHONY: load_test_simple
-load_test_simple: ## Runs the simpliest load test through the whole stack (appgate -> relayminer -> anvil)
+load_test_simple: ## Runs the simplest load test through the whole stack (appgate -> relayminer -> anvil)
 	k6 run load-testing/tests/appGateServerEtherium.js
 
 #############
@@ -317,7 +382,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 --config $(POKTROLLD_HOME)/config/$(STAKE) --keyring-backend test --from $(GATEWAY) --node $(POCKET_NODE)
+	poktrolld --home=$(POKTROLLD_HOME) tx gateway stake-gateway --config $(POKTROLLD_HOME)/config/$(STAKE) --keyring-backend test --from $(GATEWAY) --node $(POCKET_NODE) --chain-id $(CHAIN_ID)
 
 .PHONY: gateway1_stake
 gateway1_stake: ## Stake gateway1
@@ -333,7 +398,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 --keyring-backend test --from $(GATEWAY) --node $(POCKET_NODE)
+	poktrolld --home=$(POKTROLLD_HOME) tx gateway unstake-gateway --keyring-backend test --from $(GATEWAY) --node $(POCKET_NODE) --chain-id $(CHAIN_ID)
 
 .PHONY: gateway1_unstake
 gateway1_unstake: ## Unstake gateway1
@@ -357,7 +422,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 --config $(POKTROLLD_HOME)/config/$(SERVICES) --keyring-backend test --from $(APP) --node $(POCKET_NODE)
+	poktrolld --home=$(POKTROLLD_HOME) tx application stake-application --config $(POKTROLLD_HOME)/config/$(SERVICES) --keyring-backend test --from $(APP) --node $(POCKET_NODE) --chain-id $(CHAIN_ID)
 
 .PHONY: app1_stake
 app1_stake: ## Stake app1 (also staked in genesis)
@@ -373,7 +438,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 --keyring-backend test --from $(APP) --node $(POCKET_NODE)
+	poktrolld --home=$(POKTROLLD_HOME) tx application unstake-application --keyring-backend test --from $(APP) --node $(POCKET_NODE) --chain-id $(CHAIN_ID)
 
 .PHONY: app1_unstake
 app1_unstake: ## Unstake app1
@@ -389,7 +454,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)
+	poktrolld --home=$(POKTROLLD_HOME) tx application delegate-to-gateway $(GATEWAY_ADDR) --keyring-backend test --from $(APP) --node $(POCKET_NODE) --chain-id $(CHAIN_ID)
 
 .PHONY: app1_delegate_gateway1
 app1_delegate_gateway1: ## Delegate trust to gateway1
@@ -408,7 +473,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)
+	poktrolld --home=$(POKTROLLD_HOME) tx application undelegate-from-gateway $(GATEWAY_ADDR) --keyring-backend test --from $(APP) --node $(POCKET_NODE) --chain-id $(CHAIN_ID)
 
 .PHONY: app1_undelegate_gateway1
 app1_undelegate_gateway1: ## Undelegate trust to gateway1
@@ -435,7 +500,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 --config $(POKTROLLD_HOME)/config/$(SERVICES) --keyring-backend test --from $(SUPPLIER) --node $(POCKET_NODE)
+	poktrolld --home=$(POKTROLLD_HOME) tx supplier stake-supplier --config $(POKTROLLD_HOME)/config/$(SERVICES) --keyring-backend test --from $(SUPPLIER) --node $(POCKET_NODE) --chain-id $(CHAIN_ID)
 
 .PHONY: supplier1_stake
 supplier1_stake: ## Stake supplier1 (also staked in genesis)
@@ -451,7 +516,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)
+	poktrolld --home=$(POKTROLLD_HOME) tx supplier unstake-supplier --keyring-backend test --from $(SUPPLIER) --node $(POCKET_NODE) --chain-id $(CHAIN_ID)
 
 .PHONY: supplier1_unstake
 supplier1_unstake: ## Unstake supplier1
@@ -537,11 +602,12 @@ acc_initialize_pubkeys: ## Make sure the account keeper has public keys for all
 			$(addr) $(PNF_ADDR) 1000upokt \
 			--yes \
 			--home=$(POKTROLLD_HOME) \
-			--node $(POCKET_NODE);)
+			--node $(POCKET_NODE) \
+			--chain-id $(CHAIN_ID);)
 
 .PHONY: acc_initialize_pubkeys_warn_message
 acc_initialize_pubkeys_warn_message: ## Print a warning message about the need to run `make acc_initialize_pubkeys`
-	@printf "!!! YOU MUST RUN THE FOLLOWING COMMAND ONCE FOR E2E TESTS TO WORK AFTER THE NETWORK HAS STARTED!!!\n"\
+	@printf "!!!!!!!!! YOU MUST RUN THE FOLLOWING COMMAND ONCE FOR E2E TESTS TO WORK AFTER THE NETWORK HAS STARTED !!!!!!!!!\n"\
 	"\t\tmake acc_initialize_pubkeys\n"
 
 ##############
@@ -592,7 +658,7 @@ MODULES := application gateway pocket service session supplier tokenomics
 # TODO_IMPROVE(#322): Improve once we decide how to handle parameter updates
 .PHONY: update_tokenomics_params
 update_tokenomics_params: ## Update the tokenomics module params
-	poktrolld --home=$(POKTROLLD_HOME) tx tokenomics update-params 43 --keyring-backend test --from pnf --node $(POCKET_NODE)
+	poktrolld --home=$(POKTROLLD_HOME) tx tokenomics update-params 43 --keyring-backend test --from pnf --node $(POCKET_NODE) --chain-id $(CHAIN_ID)
 
 .PHONY: query_all_params
 query_all_params: check_jq ## Query the params from all available modules