Skip to content

Commit

Permalink
feat: Bump Cosmos SDK to v0.46.10 [DEV-2290] (#556)
Browse files Browse the repository at this point in the history
* Fix Dockerfile make statements

* Update cleanup-actions.yml

* Bump Goreleaser

* Update dispatch.yml

* Temporary build statement

* Fix make install and rlcp

* Combined build with CGO_ENABLED=0

* Move to 0.46.10 cosmos-sdk

* Get linter version back

* Add findutils for Docker building

* Manual sync packages from cheqd-node for api subpackage

* Update README.md

* Get tests back

* bump package lock

* Update buf.lock

* Update .goreleaser.yml

* Add gofumpt to make swagger

* Fix build statement

* Target specific builds in goreleaser

* Update Dockerfile

* Update Makefile

* Move flies app/client/docs

* Update .gitignore

* Switch to app/client/docs

* Update protoc-swagger-gen.sh

* Update build.yml

* Update .gitignore

* Update go.mod

* Update go.sum

* Update app.go

* Move files

* Update .gitignore

* Delete query.swagger.json

* Delete query.swagger.json

* Update config.yaml

* Create statik.go

* Update app.go

* Update api/go.mod

* Update go.work.sum

---------

Co-authored-by: Andrew Nikitin <[email protected]>
  • Loading branch information
ankurdotb and Andrew Nikitin authored Mar 1, 2023
1 parent 49fc248 commit 75a5220
Show file tree
Hide file tree
Showing 21 changed files with 1,820 additions and 1,863 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ jobs:
with:
distribution: goreleaser
version: latest
args: build --clean --snapshot --id ubuntu-latest-amd64
args: build --clean --snapshot --single-target

- name: Store artifact
uses: actions/upload-artifact@v3
with:
name: cheqd-noded
path: dist/ubuntu-latest-amd64_linux_amd64_v1/cheqd-noded
path: dist/linux-amd64_linux_amd64_v1/cheqd-noded

build-docker:
name: "Docker image"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cleanup-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ on:
description: 'Retain days'
required: true
type: string
default: 30
default: "30"
minimum_runs:
description: 'Minimum runs to keep for each workflow'
required: true
type: string
default: 0
default: "0"
delete_workflow_pattern:
description: 'Name/filename of workflow. Default is all.'
required: false
Expand Down
7 changes: 2 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
### APP-SPECIFIC EXCLUSIONS ###

# Ignored directories
api/docs/cheqd/
api/docs/swagger-ui/
app/client/docs/cheqd/
app/client/docs/swagger-ui/
build/
dist/
**/network-config

# Ignored files

# Allowed files


### GENERAL EXCLUSIONS ###

### GitBook ###
Expand Down
33 changes: 27 additions & 6 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ before:
hooks:
- make clean
- make tidy
- make install
- make proto-gen
- make swagger

builds:
- id: ubuntu-latest-amd64
- id: linux-amd64
main: ./cmd/cheqd-noded
binary: cheqd-noded
targets:
Expand All @@ -32,14 +32,13 @@ builds:
- -X github.com/cosmos/cosmos-sdk/version.Commit={{ .Commit }}
- -X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger,goleveldb

- id: ubuntu-latest-arm64
- id: linux-arm64
main: ./cmd/cheqd-noded
binary: cheqd-noded
targets:
- "linux_arm64"
hooks:
pre:
- sudo apt update && sudo apt install clang gcc-multilib g++-multilib -y
env:
- CGO_ENABLED=0
flags:
- -mod=readonly
- -tags="netgo ledger goleveldb"
Expand All @@ -52,9 +51,31 @@ builds:
- -X github.com/cosmos/cosmos-sdk/version.Commit={{ .Commit }}
- -X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger,goleveldb

- id: darwin
env:
- CGO_ENABLED=0
main: ./cmd/cheqd-noded
binary: cheqd-noded
goos:
- darwin
goarch:
- amd64
- arm64
flags:
- -mod=readonly
- -tags="netgo ledger goleveldb"
- -trimpath
ldflags:
- -s -w
- -X github.com/cosmos/cosmos-sdk/version.Name=cheqd-noded
- -X github.com/cosmos/cosmos-sdk/version.AppName=cheqd-noded
- -X github.com/cosmos/cosmos-sdk/version.Version={{ .Version }}
- -X github.com/cosmos/cosmos-sdk/version.Commit={{ .Commit }}
- -X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger,goleveldb

archives:
- id: release-archives
rlcp: true
format: tar.gz
wrap_in_directory: false
name_template: "{{ .Binary }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
Expand Down
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,13 @@ endif

build_tags += $(BUILD_TAGS)
build_tags := $(strip $(build_tags))

# process linker flags

empty :=
whitespace := $(empty) $(empty)
comma := ,
build_tags_comma_sep := $(subst $(whitespace),$(comma),$(build_tags))

# process linker flags

ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=cheqd-noded \
-X github.com/cosmos/cosmos-sdk/version.AppName=cheqd-noded \
-X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Either the cheqd team, or one of your fellow node operators will be happy to off

Getting started as a node operator on the cheqd network [mainnet](https://explorer.cheqd.io) is as simple as...

1. Install [the latest stable release](https://github.com/cheqd/cheqd-node/releases/latest) of `cheqd-node` software (currently `v0.6.x`) on a hosting platform of your choice by [following the setup guide](https://docs.cheqd.io/node/docs/setup-and-configure).
1. Install [the latest stable release](https://github.com/cheqd/cheqd-node/releases/latest) of `cheqd-node` software (currently `v1.x.x`) on a hosting platform of your choice by [following the setup guide](https://docs.cheqd.io/node/docs/setup-and-configure).
2. Once you have acquired CHEQ tokens, [promote your node to a validator](https://docs.cheqd.io/node/docs/validator-guide)

If successfully configured, your node would become the latest validator on the cheqd mainnet. Welcome to the new digital ID revolution!
Expand Down
17 changes: 9 additions & 8 deletions api/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@ module github.com/cheqd/cheqd-node/api/v2
go 1.18

require (
github.com/cosmos/cosmos-proto v1.0.0-alpha7
github.com/cosmos/cosmos-proto v1.0.0-alpha8
github.com/cosmos/cosmos-sdk/api v0.1.0
github.com/cosmos/gogoproto v1.4.3
github.com/rakyll/statik v0.1.7
google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106
google.golang.org/grpc v1.51.0
github.com/cosmos/gogoproto v1.4.6
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f
google.golang.org/grpc v1.53.0
google.golang.org/protobuf v1.28.1
)

require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
golang.org/x/text v0.4.0 // indirect
github.com/google/go-cmp v0.5.9 // indirect
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 // indirect
golang.org/x/net v0.6.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
)
Loading

0 comments on commit 75a5220

Please sign in to comment.