Skip to content

Commit

Permalink
Merge branch 'issues/516/feat/proof-window-open-offset-blocks' into i…
Browse files Browse the repository at this point in the history
…ssues/516/feat/proof-window-close-offset-blocks

* issues/516/feat/proof-window-open-offset-blocks:
  chore: update comments
  [TODO] Team's Iteration16 TODO preparation (#577)
  Updated go.sum & go.mod
  [Tooling] Updated Makefile target for Grove gateway (#575)
  [Ring] Replace `noot/ring-go` with `pokt-network/ring-go` (#563)
  [On-chain] feat: add `claim_window_close_offset_blocks` shared module param (#568)
  chore: add param update make target
  Empty commit
  [Relayminer] refactor: relayminer to use `claim_window_open_offset_blocks` shared param (#565)
  [Claim/proof] feat: add `claim_window_open_offset_blocks` shared module param (#561)
  Empty commit
  chore: self-review improvements
  • Loading branch information
bryanchriswhite committed Jun 5, 2024
2 parents 6a61aa5 + a19f385 commit 5c336e9
Show file tree
Hide file tree
Showing 158 changed files with 2,084 additions and 767 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

# This is commented out because proto generated code is now tracked in the
# repo so this step is skipped.
# TODO_IMPROVE: Have a step that regenerates the proto files and ensures
# TODO_IMPROVE(@okdas): Have a step that regenerates the proto files and ensures
# if they are up to date. See https://github.com/pokt-network/poktroll/pull/544#issuecomment-2123063491
# - name: Generate protobufs
# run: make proto_regen
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

# This is commented out because proto generated code is now tracked in the
# repo so this step is skipped.
# TODO_IMPROVE: Have a step that regenerates the proto files and ensures
# TODO_IMPROVE(@okdas): Have a step that regenerates the proto files and ensures
# if they are up to date. See https://github.com/pokt-network/poktroll/pull/544#issuecomment-2123063491
# - name: Generate protobufs
# run: make proto_regen
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
cache-to: type=gha,mode=max
context: .

# TODO(@okdas): use for releases (also change the "on" part at the top so it only tgirrered for tags/releases)
# TODO_TECHDEBT(@okdas): use for releases (also change the "on" part at the top so it only tgirrered for tags/releases)
- name: Add release and publish binaries
uses: softprops/action-gh-release@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

# This is commented out because proto generated code is now tracked in the
# repo so this step is skipped.
# TODO_IMPROVE: Have a step that regenerates the proto files and ensures
# TODO_IMPROVE(@okdas): Have a step that regenerates the proto files and ensures
# if they are up to date. See https://github.com/pokt-network/poktroll/pull/544#issuecomment-2123063491
# - name: Generate protobufs
# run: make proto_regen
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ go.work.sum
**/gomock_reflect_*

# SMT KVStore files
# TODO_TECHDEBT(#126, @red-0ne): Rename `smt` to `smt_stores` and make it configurable so it can be stored anywhere on this
# TODO_TECHDEBT(@red-0ne, #126): Rename `smt` to `smt_stores` and make it configurable so it can be stored anywhere on this
smt
smt_stores

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN mv /poktroll/bin/ignite /usr/bin/ && mv /poktroll/bin/poktrolld /usr/bin/

RUN make localnet_regenesis

# TODO_TECHDEBT(@okdas): Ports are not documented as they will soon be changed with a document to follow
# TODO_DOCUMENT(@okdas): Ports are not documented as they will soon be changed with a document to follow
EXPOSE 8545
EXPOSE 8546
EXPOSE 8547
Expand Down
30 changes: 16 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ CHAIN_ID = poktroll

# The domain ending in ".town" is staging, ".city" is production
GROVE_GATEWAY_STAGING_ETH_MAINNET = https://eth-mainnet.rpc.grove.town
# The "protocol" field here instructs the Grove gateway which network to use
JSON_RPC_DATA_ETH_BLOCK_HEIGHT = '{"protocol": "shannon-testnet","jsonrpc":"2.0","id":"0","method":"eth_blockNumber", "params": []}'
# JSON RPC data for a test relay request
JSON_RPC_DATA_ETH_BLOCK_HEIGHT = '{"jsonrpc":"2.0","id":"0","method":"eth_blockNumber", "params": []}'

# On-chain module account addresses. Search for `func TestModuleAddress` in the
# codebase to get an understanding of how we got these values.
Expand Down Expand Up @@ -76,8 +76,8 @@ endif
### Dependencies ###
####################

# TODO: Add other dependencies (ignite, docker, k8s, etc) here
# TODO(@okdas): bump `golangci-lint` when we upgrade golang to 1.21+
# TODO_IMPROVE(@okdas): Add other dependencies (ignite, docker, k8s, etc) here
# TODO_BLOCKER(@okdas): bump `golangci-lint` when we upgrade golang to 1.21+
.PHONY: install_ci_deps
install_ci_deps: ## Installs `mockgen` and other go tools
go install "github.com/golang/mock/[email protected]" && mockgen --version
Expand Down Expand Up @@ -107,9 +107,6 @@ help: ## Prints all the targets in all the Makefiles
### Checks ###
##############

# TODO_DOCUMENT: All of the `check_` helpers can be installed differently depending
# on the user's OS and enviornment.

.PHONY: check_go_version
# Internal helper target - check go version
check_go_version:
Expand Down Expand Up @@ -330,7 +327,7 @@ send_relay_delegating_app: # Send a relay through the gateway as an application
--data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}' \
$(GATEWAY_URL)/anvil?applicationAddr=$$appAddr

# TODO_BLOCKER(@okdas): Figure out how to copy these over w/ a functional state.
# TODO_TECHDEBT(@okdas): Figure out how to copy these over w/ a functional state.
# cp ${HOME}/.poktroll/config/app.toml $(POKTROLLD_HOME)/config/app.toml
# cp ${HOME}/.poktroll/config/config.toml $(POKTROLLD_HOME)/config/config.toml
# cp ${HOME}/.poktroll/config/client.toml $(POKTROLLD_HOME)/config/client.toml
Expand Down Expand Up @@ -825,7 +822,7 @@ params_update_tokenomics_all: ## Update the tokenomics module params
poktrolld tx authz exec ./tools/scripts/params/tokenomics_all.json $(PARAM_FLAGS)

.PHONY: params_update_tokenomics_compute_units_to_tokens_multiplier
params_update_tokenomics_compute_units_to_tokens_multiplier: ## Update the tokenomics module params
params_update_tokenomics_compute_units_to_tokens_multiplier: ## Update the tokenomics module compute_units_to_tokens_multiplier param
poktrolld tx authz exec ./tools/scripts/params/tokenomics_compute_units_to_tokens_multiplier.json $(PARAM_FLAGS)

### Proof Module Params ###
Expand All @@ -834,7 +831,7 @@ params_update_proof_all: ## Update the proof module params
poktrolld tx authz exec ./tools/scripts/params/proof_all.json $(PARAM_FLAGS)

.PHONY: params_update_proof_min_relay_difficulty_bits
params_update_proof_min_relay_difficulty_bits: ## Update the proof module params
params_update_proof_min_relay_difficulty_bits: ## Update the proof module min_relay_difficulty_bits param
poktrolld tx authz exec ./tools/scripts/params/proof_min_relay_difficulty_bits.json $(PARAM_FLAGS)

### Shared Module Params ###
Expand All @@ -843,17 +840,21 @@ params_update_shared_all: ## Update the session module params
poktrolld tx authz exec ./tools/scripts/params/shared_all.json $(PARAM_FLAGS)

.PHONY: params_update_shared_num_blocks_per_session
params_update_shared_num_blocks_per_session: ## Update the shared module params
params_update_shared_num_blocks_per_session: ## Update the shared module num_blocks_per_session param
poktrolld tx authz exec ./tools/scripts/params/shared_num_blocks_per_session.json $(PARAM_FLAGS)

.PHONY: params_update_shared_claim_window_open_offset_blocks
params_update_shared_claim_window_open_offset_blocks: ## Update the shared module params
params_update_shared_claim_window_open_offset_blocks: ## Update the shared module claim_window_open_offset_blocks param
poktrolld tx authz exec ./tools/scripts/params/shared_claim_window_open_offset_blocks.json $(PARAM_FLAGS)

.PHONY: params_update_shared_claim_window_close_offset_blocks
params_update_shared_claim_window_close_offset_blocks: ## Update the shared module params
params_update_shared_claim_window_close_offset_blocks: ## Update the shared module claim_window_close_offset_blocks param
poktrolld tx authz exec ./tools/scripts/params/shared_claim_window_close_offset_blocks.json $(PARAM_FLAGS)

.PHONY: params_update_shared_proof_window_open_offset_blocks
params_update_shared_proof_window_open_offset_blocks: ## Update the shared module proof_window_open_offset_blocks param
poktrolld tx authz exec ./tools/scripts/params/shared_proof_window_open_offset_blocks.json $(PARAM_FLAGS)

.PHONY: params_query_all
params_query_all: check_jq ## Query the params from all available modules
@for module in $(MODULES); do \
Expand Down Expand Up @@ -981,4 +982,5 @@ act_reviewdog: check_act check_gh ## Run the reviewdog workflow locally like so:
grove_staging_eth_block_height: ## Sends a relay through the staging grove gateway to the eth-mainnet chain. Must have GROVE_STAGING_PORTAL_APP_ID environment variable set.
curl $(GROVE_GATEWAY_STAGING_ETH_MAINNET)/v1/$(GROVE_STAGING_PORTAL_APP_ID) \
-H 'Content-Type: application/json' \
--data $(SHANNON_JSON_RPC_DATA_ETH_BLOCK_HEIGHT)
-H 'Protocol: shannon-testnet' \
--data $(JSON_RPC_DATA_ETH_BLOCK_HEIGHT)
4 changes: 2 additions & 2 deletions Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ localnet_config_defaults = {
"count": 1,
"delve": {"enabled": False},
},
# TODO(#511): Add support for `REST` and enabled this.
# TODO_BLOCKER(@red-0ne, #511): Add support for `REST` and enabled this.
"ollama": {
"enabled": False,
"model": "qwen:0.5b",
Expand Down Expand Up @@ -143,7 +143,7 @@ secret_create_generic(
configmap_create(
"poktrolld-configs", from_file=listdir("localnet/poktrolld/config/"), watch=True
)
# TODO(@okdas): Import validator keys when we switch to `poktrolld` helm chart
# TODO_BLOCKER(@okdas): Import validator keys when we switch to `poktrolld` helm chart
# by uncommenting the following lines:
# load("ext://secret", "secret_create_generic")
# secret_create_generic(
Expand Down
2 changes: 1 addition & 1 deletion api/poktroll/application/application.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/poktroll/service/query.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions api/poktroll/service/tx.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/poktroll/shared/service.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion api/poktroll/tokenomics/params.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions app/app.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package app

import (
sharedmodulekeeper "github.com/pokt-network/poktroll/x/shared/keeper"
// this line is used by starport scaffolding # stargate/app/moduleImport
"io"
"os"
Expand Down Expand Up @@ -62,6 +61,7 @@ import (
proofmodulekeeper "github.com/pokt-network/poktroll/x/proof/keeper"
servicemodulekeeper "github.com/pokt-network/poktroll/x/service/keeper"
sessionmodulekeeper "github.com/pokt-network/poktroll/x/session/keeper"
sharedmodulekeeper "github.com/pokt-network/poktroll/x/shared/keeper"
suppliermodulekeeper "github.com/pokt-network/poktroll/x/supplier/keeper"
tokenomicsmodulekeeper "github.com/pokt-network/poktroll/x/tokenomics/keeper"
)
Expand Down Expand Up @@ -192,7 +192,6 @@ func New(
appBuilder *runtime.AppBuilder

// merge the AppConfig and other configuration in one config
// TODO_BLOCKER(@Olshansk): Revisit the advanced configuration and understand if/where it fits in Shannon
appConfig = depinject.Configs(
AppConfig(),
depinject.Supply(
Expand Down
2 changes: 1 addition & 1 deletion config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ genesis:
staking:
params:
bond_denom: upokt
# TODO_BLOCKER(@Olshansk): Figure out what this should be on Shannon
# TODO_MAINNET(@Olshansk): Figure out what this should be on Shannon
# re-genesis. We're setting it to 1 for Alpha TestNet #1 so Grove
# maintains the only validator until Alpha TestNet #2.
max_validators: 1
Expand Down
Loading

0 comments on commit 5c336e9

Please sign in to comment.