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.

Sign up for GitHub

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

Jump to bottom

chore: upgrade to cosmos-sdk v1.16.1-sdk-v0.46.13 #2115

Merged
merged 5 commits into from
Jul 24, 2023
Merged

chore: upgrade to cosmos-sdk v1.16.1-sdk-v0.46.13 #2115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fd0fc18
chore: upgrade to cosmos-sdk v1.16.1-sdk-v0.46.13
rootulp Jul 14, 2023
3637b81
chore: update common pipeline to v0.2.2 (#2086)
tty47 Jul 12, 2023
61c4ffc
refactor: use `SecondsPerYear` (#2043)
SurajAnand88 Jul 11, 2023
97790fa
fix: explicit int64 for NanosecondsPerYear (#2121)
rootulp Jul 18, 2023
722f958
fix: int overflow for 32 bit machines (#2135)
rootulp Jul 20, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/docker-build-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ jobs:
permissions:
contents: write
packages: write
uses: celestiaorg/.github/.github/workflows/[email protected].0 # yamllint disable-line rule:line-length
uses: celestiaorg/.github/.github/workflows/[email protected].2 # yamllint disable-line rule:line-length
with:
dockerfile: Dockerfile
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ require (
)

replace (
github.com/cosmos/cosmos-sdk => github.com/celestiaorg/cosmos-sdk v1.16.0-sdk-v0.46.13
github.com/cosmos/cosmos-sdk => github.com/celestiaorg/cosmos-sdk v1.16.1-sdk-v0.46.13
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.24.0-tm-v0.34.28
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOC
github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
github.com/celestiaorg/celestia-core v1.24.0-tm-v0.34.28 h1:eXS3v26nob8Xs2+flKHVxcTzhzQW44KgTcooR3OxnK4=
github.com/celestiaorg/celestia-core v1.24.0-tm-v0.34.28/go.mod h1:J/GsBjoTZaFz71VeyrLZbG8rV+Rzi6oFEUZUipQ97hQ=
github.com/celestiaorg/cosmos-sdk v1.16.0-sdk-v0.46.13 h1:N1PrCWcYkaODeIQyyVBmDKDTwiQWZ31bgtTEYIGeby8=
github.com/celestiaorg/cosmos-sdk v1.16.0-sdk-v0.46.13/go.mod h1:xpBZc/OYZ736hp0IZlBGNUhEgCD9C+bKs8yNLZibyv0=
github.com/celestiaorg/cosmos-sdk v1.16.1-sdk-v0.46.13 h1:CxEQDQEQR1ypB+VUmCISIqFVmHfb+mx8x+zh7rHbyU8=
github.com/celestiaorg/cosmos-sdk v1.16.1-sdk-v0.46.13/go.mod h1:xpBZc/OYZ736hp0IZlBGNUhEgCD9C+bKs8yNLZibyv0=
github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4 h1:CJdIpo8n5MFP2MwK0gSRcOVlDlFdQJO1p+FqdxYzmvc=
github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4/go.mod h1:fzuHnhzj1pUygGz+1ZkB3uQbEUL4htqCGJ4Qs2LwMZA=
github.com/celestiaorg/nmt v0.17.0 h1:/k8YLwJvuHgT/jQ435zXKaDX811+sYEMXL4B/vYdSLU=
Expand Down
2 changes: 1 addition & 1 deletion x/mint/test/mint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func (s *IntegrationTestSuite) TestInflationRate() {
require := s.Require()

type testCase struct {
year int
year int64
want sdktypes.Dec
}
testCases := []testCase{
Expand Down
4 changes: 2 additions & 2 deletions x/mint/types/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ const (
// value isn't 365 because 97 out of 400 years are leap years. See
// https://en.wikipedia.org/wiki/Year
DaysPerYear = 365.2425
SecondsPerYear = int(SecondsPerMinute * MinutesPerHour * HoursPerDay * DaysPerYear) // 31,556,952
NanosecondsPerYear = int(NanosecondsPerSecond * SecondsPerMinute * MinutesPerHour * HoursPerDay * DaysPerYear) // 31,556,952,000,000,000
SecondsPerYear = int64(SecondsPerMinute * MinutesPerHour * HoursPerDay * DaysPerYear) // 31,556,952
NanosecondsPerYear = int64(NanosecondsPerSecond * SecondsPerYear) // 31,556,952,000,000,000

InitialInflationRate = 0.08
DisinflationRate = 0.1
Expand Down
4 changes: 2 additions & 2 deletions x/mint/types/minter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func TestCalculateInflationRate(t *testing.T) {
genesisTime := time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC)

type testCase struct {
year int
year int64
want float64
}

Expand Down Expand Up @@ -66,7 +66,7 @@ func TestCalculateInflationRate(t *testing.T) {
}

for _, tc := range testCases {
years := time.Duration(tc.year * NanosecondsPerYear * int(time.Nanosecond))
years := time.Duration(tc.year * NanosecondsPerYear * int64(time.Nanosecond))
blockTime := genesisTime.Add(years)
ctx := sdk.NewContext(nil, tmproto.Header{}, false, nil).WithBlockTime(blockTime)
inflationRate := minter.CalculateInflationRate(ctx, genesisTime)
Expand Down