Skip to content

Commit

Permalink
upgraded comet (#1340)
Browse files Browse the repository at this point in the history
  • Loading branch information
sampocs authored Feb 3, 2025
1 parent 41eb417 commit 4354ac3
Show file tree
Hide file tree
Showing 13 changed files with 153 additions and 168 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Verify no Admins change
name: Admins List

on:
push:
Expand All @@ -11,7 +11,7 @@ on:
jobs:
build:
runs-on: ubuntu-latest
name: Verify admins.go did not change
name: Verify admins.go
steps:
- uses: actions/checkout@v3
with:
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,30 @@ on:
jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
arch: [amd64]
targetos: [darwin, linux]
include:
- targetos: darwin
arch: arm64
name: stride ${{ matrix.arch }} for ${{ matrix.targetos }}

name: ${{ matrix.arch }} for ${{ matrix.targetos }}
steps:
- uses: actions/checkout@v3

- uses: actions/setup-go@v3
with:
go-version: 1.21
go-version: 1.22
env:
GOOS: ${{ matrix.targetos }}
GOARCH: ${{ matrix.arch }}

- name: Compile stride
run: make build
- uses: actions/upload-artifact@v3

- uses: actions/upload-artifact@v4
with:
name: strided ${{ matrix.targetos }} ${{ matrix.arch }}
path: build/strided
14 changes: 9 additions & 5 deletions .github/workflows/gosec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,18 @@ on:
pull_request:
branches: [ "main" ]
jobs:
tests:
Gosec:
runs-on: ubuntu-latest
env:
GO111MODULE: on
steps:
- name: Checkout Source
uses: actions/checkout@v3

- name: Setup Golang
uses: actions/setup-go@v5
with:
go-version: 1.22.11

- name: Run Gosec Security Scanner
uses: securego/gosec@v2.18.2
uses: securego/gosec@v2.22.0
with:
args: -exclude-dir=deps -severity=high ./...
args: -exclude-dir=deps -exclude-generated -severity=high ./...
2 changes: 1 addition & 1 deletion .github/workflows/label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions:
pull-requests: write

jobs:
label:
Label:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ on:
branches: ["main"]

jobs:
golangci:
name: golangci-lint
build:
name: Go Lint
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: 1.21
go-version: 1.22
- uses: golangci/[email protected]
with:
version: latest
Expand Down
41 changes: 13 additions & 28 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Tests & Code Coverage
name: Tests

on:
push:
Expand All @@ -7,10 +7,9 @@ on:
branches: ["main"]

jobs:
should_run_unit_tests:
build:
name: "Unit Tests"
runs-on: ubuntu-latest
outputs:
should_skip: ${{ steps.skip_check.outputs.should_skip }}
steps:
- id: skip_check
uses: fkirc/skip-duplicate-actions@master
Expand All @@ -20,35 +19,21 @@ jobs:
skip_after_successful_duplicate: "true"
paths: '["**/*.go", "**/*.mod", "**/*.sum"]'
do_not_skip: '["pull_request", "workflow_dispatch", "schedule"]'

- name: Skipping test
run: echo Should I skip tests? ${{ steps.skip_check.outputs.should_skip }}

unit_tests:
needs: should_run_unit_tests
if: ${{ needs.should_run_test.outputs.should_skip != 'true' }}
runs-on: ubuntu-latest
steps:
- name: Check out repository code
uses: actions/checkout@v2
if: steps.skip_check.outputs.should_skip != 'true'
uses: actions/checkout@v3

- name: Setup Golang
uses: actions/[email protected]
if: steps.skip_check.outputs.should_skip != 'true'
uses: actions/setup-go@v5
with:
go-version: 1.21
# - name: Get data from build cache
# uses: actions/cache@v2
# with:
# # In order:
# # * Module download cache
# # * Build cache (Linux)
# # * Build cache (Mac)
# # * Build cache (Windows)
# path: |
# ~/go/pkg/mod
# ~/.cache/go-build
# ~/Library/Caches/go-build
# ~\AppData\Local\go-build
# key: ${{ runner.os }}-go-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }}
# restore-keys: |
# ${{ runner.os }}-go-${{ matrix.go-version }}-
go-version: 1.22

- name: Run all unit tests
if: steps.skip_check.outputs.should_skip != 'true'
run: make test-unit

4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax = docker/dockerfile:1

ARG GO_VERSION="1.21"
ARG RUNNER_IMAGE_VERSION="3.17"
ARG GO_VERSION="1.22"
ARG RUNNER_IMAGE_VERSION="3.20"

FROM golang:${GO_VERSION}-alpine${RUNNER_IMAGE_VERSION} AS builder

Expand Down
2 changes: 1 addition & 1 deletion dockernet/src/register_host.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ sleep 5
# Confirm the ICA accounts have been registered before continuing
timeout=100
while true; do
if ! $STRIDE_MAIN_CMD q stakeibc show-host-zone $CHAIN_ID | grep -q 'ica_address: ""'; then
if ! $STRIDE_MAIN_CMD q stakeibc show-host-zone $CHAIN_ID | grep -v community_pool_deposit_ica_address | grep -q 'ica_address: ""'; then
break
else
if [[ "$timeout" == "0" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion dockernet/upgrades/Dockerfile.cosmovisor
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1
FROM golang:1.21-alpine3.19 AS builder
FROM golang:1.22-alpine3.20 AS builder

ARG old_commit_hash
ARG stride_admin_address
Expand Down
68 changes: 32 additions & 36 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
module github.com/Stride-Labs/stride/v25

go 1.21.1

toolchain go1.21.3
go 1.22.11

require (
cosmossdk.io/errors v1.0.1
cosmossdk.io/math v1.4.0
github.com/CosmWasm/wasmd v0.46.0
github.com/CosmWasm/wasmvm v1.5.7
github.com/Stride-Labs/ibc-rate-limiting v1.0.0
github.com/cometbft/cometbft v0.37.11
github.com/cometbft/cometbft-db v0.8.0
github.com/cometbft/cometbft v0.37.15
github.com/cometbft/cometbft-db v0.9.5
github.com/cosmos/cosmos-proto v1.0.0-beta.5
github.com/cosmos/cosmos-sdk v0.47.15
github.com/cosmos/gogoproto v1.7.0
Expand All @@ -26,20 +24,19 @@ require (
github.com/golang/protobuf v1.5.4
github.com/gorilla/mux v1.8.0
github.com/grpc-ecosystem/grpc-gateway v1.16.0
github.com/prometheus/client_golang v1.16.0
github.com/prometheus/client_golang v1.20.5
github.com/spf13/cast v1.6.0
github.com/spf13/cobra v1.8.0
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2
google.golang.org/grpc v1.62.1
github.com/stretchr/testify v1.10.0
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1
google.golang.org/grpc v1.68.0
gopkg.in/yaml.v2 v2.4.0
)

require (
cloud.google.com/go v0.112.1 // indirect
cloud.google.com/go/compute v1.24.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/compute/metadata v0.5.0 // indirect
cloud.google.com/go/iam v1.1.6 // indirect
cloud.google.com/go/storage v1.38.0 // indirect
cosmossdk.io/api v0.3.1 // indirect
Expand All @@ -59,7 +56,7 @@ require (
github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chzyer/readline v1.5.1 // indirect
github.com/cockroachdb/apd/v2 v2.0.2 // indirect
github.com/cockroachdb/errors v1.10.0 // indirect
Expand All @@ -73,10 +70,10 @@ require (
github.com/cosmos/iavl v0.20.1 // indirect
github.com/cosmos/ledger-cosmos-go v0.12.4 // indirect
github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect
github.com/creachadair/taskgroup v0.4.2 // indirect
github.com/creachadair/taskgroup v0.13.0 // indirect
github.com/danieljoos/wincred v1.1.2 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
Expand All @@ -87,18 +84,18 @@ require (
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/getsentry/sentry-go v0.23.0 // indirect
github.com/go-kit/kit v0.12.0 // indirect
github.com/go-kit/kit v0.13.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
github.com/gogo/googleapis v1.4.1 // indirect
github.com/golang/glog v1.2.0 // indirect
github.com/golang/glog v1.2.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/orderedcode v0.0.1 // indirect
Expand All @@ -107,7 +104,7 @@ require (
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.3 // indirect
github.com/gorilla/handlers v1.5.1 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
github.com/gtank/merlin v0.1.1 // indirect
Expand All @@ -127,39 +124,39 @@ require (
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jmhodges/levigo v1.0.0 // indirect
github.com/klauspost/compress v1.17.2 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/lib/pq v1.10.7 // indirect
github.com/linxGnu/grocksdb v1.7.16 // indirect
github.com/lib/pq v1.10.9 // indirect
github.com/linxGnu/grocksdb v1.9.3 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/manifoldco/promptui v0.9.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
github.com/minio/highwayhash v1.0.3 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mtibben/percent v0.2.1 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/oxyno-zeta/gomock-extra-matcher v1.2.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.60.1 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rakyll/statik v0.1.7 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/rs/cors v1.8.3 // indirect
github.com/rs/cors v1.11.1 // indirect
github.com/rs/zerolog v1.33.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
github.com/sasha-s/go-deadlock v0.3.5 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/viper v1.19.0 // indirect
Expand All @@ -170,7 +167,7 @@ require (
github.com/ulikunitz/xz v0.5.11 // indirect
github.com/zondax/hid v0.9.2 // indirect
github.com/zondax/ledger-go v0.14.3 // indirect
go.etcd.io/bbolt v1.3.7 // indirect
go.etcd.io/bbolt v1.4.0-alpha.0.0.20240404170359-43604f3112c5 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
Expand All @@ -181,19 +178,18 @@ require (
go.uber.org/mock v0.2.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/oauth2 v0.18.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/api v0.171.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect
google.golang.org/protobuf v1.33.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/protobuf v1.36.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
nhooyr.io/websocket v1.8.6 // indirect
Expand Down
Loading

0 comments on commit 4354ac3

Please sign in to comment.