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(all): update cosmos-sdk deps #2221

Merged
merged 26 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
8036884
wip: pointing to local repo
abi87 Dec 6, 2024
c793ad1
Merge branch 'main' into replace-berachain-cosmos-sdk-point-local-repo-2
abi87 Dec 6, 2024
2bf2204
go mod tidy
abi87 Dec 9, 2024
b1ca464
Merge branch 'main' into replace-berachain-cosmos-sdk-point-local-repo-2
abi87 Dec 15, 2024
0f8c329
updated go.mod to use local cometbft
alesforz Dec 16, 2024
8b9c92e
Fixed bug in which the BLS12-381 compressed key was created incorrectly.
alesforz Dec 17, 2024
bf43e1a
updated go.mod with cometbft version
alesforz Dec 17, 2024
aa66559
updated version of cometbft
alesforz Dec 18, 2024
9f049f6
updated cosmos-sdk api module version
alesforz Dec 18, 2024
51ce9b0
updated cosmos-sdk core module version
alesforz Dec 18, 2024
64ba462
updated cosmos-sdk core/testing module version
alesforz Dec 18, 2024
53aa9e9
updated cosmos-sdk x/account module version
alesforz Dec 18, 2024
e32add8
updated cosmos-sdk x/bank module version
alesforz Dec 18, 2024
aab6242
updated cosmos-sdk x/staking module version
alesforz Dec 18, 2024
12a2686
updated cosmos-sdk module version
alesforz Dec 18, 2024
6183fad
Substituted use of module `/store/v2` with module `cosmos-db`
alesforz Dec 19, 2024
09f3034
updated go.mod to remove /store/v2 dependency
alesforz Dec 19, 2024
7830414
removed commented out lines in go.mod
alesforz Dec 19, 2024
4025e37
pinned cometbft version in go.mod
alesforz Dec 19, 2024
87616fc
removed commented out lines in node-core/components/deposit_store.go
alesforz Dec 19, 2024
699fe17
updated go version in the CI pipeline
alesforz Dec 19, 2024
19a0ab0
Merge branch 'main' into replace-berachain-cosmos-sdk-point-local-repo-2
abi87 Dec 19, 2024
2596435
updated go.mod to latest cometbft version
alesforz Dec 19, 2024
f0b9432
Merge pull request #2302 from informalsystems/alesforz/fix-bls-key-len
fridrik01 Dec 19, 2024
706c91e
Fix linter errors on cosmos-sdk upgrade branch (#2303)
fridrik01 Dec 19, 2024
8fa9c59
Merge branch 'main' into replace-berachain-cosmos-sdk-point-local-repo-2
abi87 Dec 20, 2024
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
37 changes: 17 additions & 20 deletions .github/workflows/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,17 @@ concurrency:
cancel-in-progress: ${{ !(github.base_ref == 'refs/heads/main' && github.event_name == 'merge_group') || github.ref != 'refs/heads/main' }}

env:
GCP_ID_PROVIDER: 'projects/341806074811/locations/global/workloadIdentityPools/oidc-apps-automation-st-01-pool/providers/gh-apps-oidc-provider'
GCP_SERVICE_ACCOUNT: 'sa-apps-deployment@prj-berachain-automation-st-01.iam.gserviceaccount.com'
GCP_ID_PROVIDER: "projects/341806074811/locations/global/workloadIdentityPools/oidc-apps-automation-st-01-pool/providers/gh-apps-oidc-provider"
GCP_SERVICE_ACCOUNT: "sa-apps-deployment@prj-berachain-automation-st-01.iam.gserviceaccount.com"
GCP_REGISTRY: northamerica-northeast1-docker.pkg.dev
GHCR_REGISTRY: ghcr.io
PUSH_DOCKER_IMAGE: ${{ (github.base_ref == github.head_ref && github.event_name == 'push') || github.ref == 'refs/tags/v*'}}
VERSION: ${{ github.ref_name }}

jobs:

# -------------------------------------------------------------------------- #
# Main Pipeline #
# -------------------------------------------------------------------------- #
# -------------------------------------------------------------------------- #
# Main Pipeline #
# -------------------------------------------------------------------------- #

ci:
strategy:
Expand All @@ -64,7 +63,6 @@ jobs:
- "lint"
- "slither"
- "gosec"
- "nilaway"
- "markdownlint"
- "generate-check"
- "tidy-sync-check"
Expand All @@ -90,7 +88,7 @@ jobs:
- name: Setup Golang
uses: actions/setup-go@v5
with:
go-version: "1.23.0"
go-version: "1.23.4"
check-latest: true
cache-dependency-path: "**/*.sum"
if: ${{ !(matrix.args == 'test-forge-cover' || matrix.args == 'test-forge-fuzz') }}
Expand All @@ -106,10 +104,9 @@ jobs:
files: ./${{ matrix.args }}.txt
if: ${{ matrix.args == 'test-unit-cover' || matrix.args == 'test-forge-cover'}}


# -------------------------------------------------------------------------- #
# E2E Testing #
# -------------------------------------------------------------------------- #
# -------------------------------------------------------------------------- #
# E2E Testing #
# -------------------------------------------------------------------------- #

ci-e2e:
strategy:
Expand Down Expand Up @@ -155,9 +152,9 @@ jobs:
env:
GOPATH: /home/runner/go

# -------------------------------------------------------------------------- #
# Docker Container Build and Push #
# -------------------------------------------------------------------------- #
# -------------------------------------------------------------------------- #
# Docker Container Build and Push #
# -------------------------------------------------------------------------- #

build-and-push-container:
runs-on:
Expand Down Expand Up @@ -203,15 +200,15 @@ jobs:

- if: ${{ env.PUSH_DOCKER_IMAGE == 'true' }}
name: Authenticate to Google Cloud
id: 'auth'
uses: 'google-github-actions/auth@v2'
id: "auth"
uses: "google-github-actions/auth@v2"
with:
workload_identity_provider: ${{ env.GCP_ID_PROVIDER }}
service_account: ${{ env.GCP_SERVICE_ACCOUNT }}

- if: ${{ env.PUSH_DOCKER_IMAGE == 'true' }}
name: 'Set up Cloud SDK'
uses: 'google-github-actions/setup-gcloud@v2'
name: "Set up Cloud SDK"
uses: "google-github-actions/setup-gcloud@v2"

- if: ${{ env.PUSH_DOCKER_IMAGE == 'true' }}
name: Setup Docker to use Google Cloud OIDC
Expand All @@ -221,4 +218,4 @@ jobs:
- if: ${{ env.PUSH_DOCKER_IMAGE == 'true' }}
name: Push Docker image
run: |
make push-docker-gcp push-docker-github
make push-docker-gcp push-docker-github
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
### Stage 0 - Build Arguments ###
#######################################################

ARG GO_VERSION=1.23.0
ARG GO_VERSION=1.23.4
ARG RUNNER_IMAGE=alpine:3.20
ARG BUILD_TAGS="netgo,muslc,blst,bls12381,pebbledb"
ARG NAME=beacond
Expand Down
5 changes: 5 additions & 0 deletions cli/commands/server/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ package server

import (
"context"
"errors"

pruningtypes "cosmossdk.io/store/pruning/types"
types "github.com/berachain/beacon-kit/cli/commands/server/types"
Expand Down Expand Up @@ -106,6 +107,10 @@ custom: allow pruning options to be manually specified through 'pruning-keep-rec
RunE: func(cmd *cobra.Command, _ []string) error {
logger := clicontext.GetLoggerFromCmd[LoggerT](cmd)
cfg := clicontext.GetConfigFromCmd(cmd)
if cfg.Consensus.TimeoutCommit == 0 {
return errors.New("please edit your config.toml file and set timeout_commit to 1s")
}

v := clicontext.GetViperFromCmd(cmd)
_, err := GetPruningOptionsFromFlags(v)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/beacond/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/berachain/beacon-kit/node-core/components"
)

//nolint:funlen // happens
//nolint:funlen
func DefaultComponents() []any {
c := []any{
components.ProvideAttributesFactory[
Expand Down
2 changes: 1 addition & 1 deletion cmd/beacond/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
package main

import (
"cosmossdk.io/core/appmodule/v2"
appmodule "cosmossdk.io/core/appmodule/v2"
"github.com/berachain/beacon-kit/beacon/blockchain"
"github.com/berachain/beacon-kit/beacon/validator"
"github.com/berachain/beacon-kit/consensus-types/types"
Expand Down
6 changes: 5 additions & 1 deletion consensus/cometbft/cli/commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,14 @@ func StatusCommand() *cobra.Command {
if err != nil {
return err
}
cometRPC, err := clientCtx.GetNode()
if err != nil {
return err
}

status, err := cmtservice.GetNodeStatus(
context.Background(),
clientCtx,
cometRPC,
)
if err != nil {
return err
Expand Down
14 changes: 10 additions & 4 deletions consensus/cometbft/service/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,19 @@ func (s *Service[_]) Start(
return err
}

privVal, err := pvm.LoadOrGenFilePV(
cfg.PrivValidatorKeyFile(),
cfg.PrivValidatorStateFile(),
nil,
)
if err != nil {
return err
}

s.node, err = node.NewNode(
ctx,
cfg,
pvm.LoadOrGenFilePV(
cfg.PrivValidatorKeyFile(),
cfg.PrivValidatorStateFile(),
),
privVal,
nodeKey,
proxy.NewLocalClientCreator(s),
GetGenDocProvider(cfg),
Expand Down
Loading
Loading