Skip to content

Commit 41f3b7c

Browse files
pr0n00glerpr0n00gler
authored
Merge pull request #837 from neutron-org/chore/bump-cosmos-sdk-v0.50.12
Chore: cosmos-sdk v0.50.12
2 parents cf3ce62 + 4651f79 commit 41f3b7c

File tree

6 files changed

+101
-9
lines changed

6 files changed

+101
-9
lines changed

‎app/app.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
v504 "github.com/neutron-org/neutron/v5/app/upgrades/v5.0.4"
1515
v505 "github.com/neutron-org/neutron/v5/app/upgrades/v5.0.5"
1616
v510 "github.com/neutron-org/neutron/v5/app/upgrades/v5.1.0"
17+
v513 "github.com/neutron-org/neutron/v5/app/upgrades/v5.1.3"
1718
dynamicfeestypes "github.com/neutron-org/neutron/v5/x/dynamicfees/types"
1819

1920
"github.com/skip-mev/feemarket/x/feemarket"
@@ -236,6 +237,7 @@ var (
236237
v504.Upgrade,
237238
v505.Upgrade,
238239
v510.Upgrade,
240+
v513.Upgrade,
239241
}
240242

241243
// DefaultNodeHome default home directories for the application daemon

‎app/upgrades/v5.1.3/constants.go‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package v513
2+
3+
import (
4+
storetypes "cosmossdk.io/store/types"
5+
6+
"github.com/neutron-org/neutron/v5/app/upgrades"
7+
)
8+
9+
const (
10+
// UpgradeName defines the on-chain upgrade name.
11+
UpgradeName = "v5.1.3"
12+
)
13+
14+
var Upgrade = upgrades.Upgrade{
15+
UpgradeName: UpgradeName,
16+
CreateUpgradeHandler: CreateUpgradeHandler,
17+
StoreUpgrades: storetypes.StoreUpgrades{},
18+
}

‎app/upgrades/v5.1.3/upgrades.go‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package v513
2+
3+
import (
4+
"context"
5+
"fmt"
6+
7+
upgradetypes "cosmossdk.io/x/upgrade/types"
8+
"github.com/cosmos/cosmos-sdk/codec"
9+
sdk "github.com/cosmos/cosmos-sdk/types"
10+
"github.com/cosmos/cosmos-sdk/types/module"
11+
12+
"github.com/neutron-org/neutron/v5/app/upgrades"
13+
)
14+
15+
func CreateUpgradeHandler(
16+
mm *module.Manager,
17+
configurator module.Configurator,
18+
_ *upgrades.UpgradeKeepers,
19+
_ upgrades.StoreKeys,
20+
_ codec.Codec,
21+
) upgradetypes.UpgradeHandler {
22+
return func(c context.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
23+
ctx := sdk.UnwrapSDKContext(c)
24+
25+
ctx.Logger().Info("Starting module migrations...")
26+
27+
vm, err := mm.RunMigrations(ctx, configurator, vm)
28+
if err != nil {
29+
return vm, err
30+
}
31+
32+
ctx.Logger().Info(fmt.Sprintf("Migration {%s} applied", UpgradeName))
33+
return vm, nil
34+
}
35+
}

‎app/upgrades/v5.1.3/upgrades_test.go‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package v513_test
2+
3+
import (
4+
"testing"
5+
6+
upgradetypes "cosmossdk.io/x/upgrade/types"
7+
"github.com/stretchr/testify/require"
8+
"github.com/stretchr/testify/suite"
9+
10+
v513 "github.com/neutron-org/neutron/v5/app/upgrades/v5.1.3"
11+
"github.com/neutron-org/neutron/v5/testutil"
12+
)
13+
14+
type UpgradeTestSuite struct {
15+
testutil.IBCConnectionTestSuite
16+
}
17+
18+
func TestKeeperTestSuite(t *testing.T) {
19+
suite.Run(t, new(UpgradeTestSuite))
20+
}
21+
22+
func (suite *UpgradeTestSuite) SetupTest() {
23+
suite.IBCConnectionTestSuite.SetupTest()
24+
}
25+
26+
func (suite *UpgradeTestSuite) TestUpgrade() {
27+
app := suite.GetNeutronZoneApp(suite.ChainA)
28+
ctx := suite.ChainA.GetContext().WithChainID("neutron-1")
29+
t := suite.T()
30+
31+
upgrade := upgradetypes.Plan{
32+
Name: v513.UpgradeName,
33+
Info: "some text here",
34+
Height: 100,
35+
}
36+
require.NoError(t, app.UpgradeKeeper.ApplyUpgrade(ctx, upgrade))
37+
}

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
github.com/CosmWasm/wasmvm/v2 v2.1.5
2020
github.com/cometbft/cometbft v0.38.17
2121
github.com/cosmos/admin-module/v2 v2.0.0-20240430142959-8b3328d1b1a2
22-
github.com/cosmos/cosmos-db v1.1.0
22+
github.com/cosmos/cosmos-db v1.1.1
2323
github.com/cosmos/cosmos-proto v1.0.0-beta.5
2424
github.com/cosmos/cosmos-sdk v0.50.11
2525
github.com/cosmos/gogoproto v1.7.0
@@ -94,7 +94,7 @@ require (
9494
github.com/cosmos/go-bip39 v1.0.0 // indirect
9595
github.com/cosmos/gogogateway v1.2.0 // indirect
9696
github.com/cosmos/iavl v1.2.2 // indirect
97-
github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect
97+
github.com/cosmos/ledger-cosmos-go v0.14.0 // indirect
9898
github.com/danieljoos/wincred v1.2.0 // indirect
9999
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
100100
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
@@ -230,7 +230,7 @@ replace (
230230
github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.53.2-neutron.0.20250122164643-8ab684b5eff6
231231
github.com/btcsuite/btcd/btcec/v2 => github.com/btcsuite/btcd/btcec/v2 v2.3.2
232232
github.com/cosmos/admin-module/v2 => github.com/neutron-org/admin-module/v2 v2.0.2
233-
github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.50.11-neutron
233+
github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.50.12-neutron
234234
// explicitely replace iavl to v1.2.0 cause sometimes go mod tidy uses not right version
235235
github.com/cosmos/iavl => github.com/cosmos/iavl v1.2.0
236236
github.com/cosmos/interchain-security/v5 => github.com/cosmos/interchain-security/v5 v5.0.0-20240802125602-fa1e09444aae

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,8 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV
358358
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
359359
github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk=
360360
github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis=
361-
github.com/cosmos/cosmos-db v1.1.0 h1:KLHNVQ73h7vawXTpj9UJ7ZR2IXv51tsEHkQJJ9EBDzI=
362-
github.com/cosmos/cosmos-db v1.1.0/go.mod h1:t7c4A6cfGdpUwwVxrQ0gQLeRQqGUBJu0yvE4F/26REg=
361+
github.com/cosmos/cosmos-db v1.1.1 h1:FezFSU37AlBC8S98NlSagL76oqBRWq/prTPvFcEJNCM=
362+
github.com/cosmos/cosmos-db v1.1.1/go.mod h1:AghjcIPqdhSLP/2Z0yha5xPH3nLnskz81pBx3tcVSAw=
363363
github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+RC5W7ZfmxJLA=
364364
github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec=
365365
github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
@@ -385,8 +385,8 @@ github.com/cosmos/interchain-security/v5 v5.0.0-20240802125602-fa1e09444aae h1:/
385385
github.com/cosmos/interchain-security/v5 v5.0.0-20240802125602-fa1e09444aae/go.mod h1:P3TM8JmE9Q20Jfch3jnFcQ4IXJp5twueRnUudi6XEGI=
386386
github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo=
387387
github.com/cosmos/keyring v1.2.0/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA=
388-
github.com/cosmos/ledger-cosmos-go v0.13.3 h1:7ehuBGuyIytsXbd4MP43mLeoN2LTOEnk5nvue4rK+yM=
389-
github.com/cosmos/ledger-cosmos-go v0.13.3/go.mod h1:HENcEP+VtahZFw38HZ3+LS3Iv5XV6svsnkk9vdJtLr8=
388+
github.com/cosmos/ledger-cosmos-go v0.14.0 h1:WfCHricT3rPbkPSVKRH+L4fQGKYHuGOK9Edpel8TYpE=
389+
github.com/cosmos/ledger-cosmos-go v0.14.0/go.mod h1:E07xCWSBl3mTGofZ2QnL4cIUzMbbGVyik84QYKbX3RA=
390390
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
391391
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
392392
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
@@ -842,8 +842,8 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi
842842
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
843843
github.com/neutron-org/admin-module/v2 v2.0.2 h1:XDDFWjvkVBKRf3lBFCazT1zAXZ3dHX8GaZ4ol8Hdk8I=
844844
github.com/neutron-org/admin-module/v2 v2.0.2/go.mod h1:RfOyabXsdJ5btcOKyKPZDYiZhtuKFubbJMOb8EJZtvA=
845-
github.com/neutron-org/cosmos-sdk v0.50.11-neutron h1:7XfK0XD+iDAq0LlAeZqG52oVipeYKFRgIldhYg0TmcU=
846-
github.com/neutron-org/cosmos-sdk v0.50.11-neutron/go.mod h1:gt14Meok2IDCjbDtjwkbUcgVNEpUBDN/4hg9cCUtLgw=
845+
github.com/neutron-org/cosmos-sdk v0.50.12-neutron h1:+99IusA1SwMVnWyPG4PN+MG8ARApMXv5+tIViXGUfnA=
846+
github.com/neutron-org/cosmos-sdk v0.50.12-neutron/go.mod h1:hrWEFMU1eoXqLJeE6VVESpJDQH67FS1nnMrQIjO2daw=
847847
github.com/neutron-org/wasmd v0.53.2-neutron.0.20250122164643-8ab684b5eff6 h1:AUYYxKenTOqIoajmOT1vnMKaTQevStZzzjaid+bwMUk=
848848
github.com/neutron-org/wasmd v0.53.2-neutron.0.20250122164643-8ab684b5eff6/go.mod h1:gP10E56tuToU5rsZR7vZLBL5ssW2mie6KN/WrQLG7/I=
849849
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=

0 commit comments

Comments
 (0)