Skip to content

Commit 9f09e73

Browse files
authored
refactor: v11 module path, empty upgrade handler (#564)
1 parent 5264ac1 commit 9f09e73

14 files changed

Lines changed: 25 additions & 237 deletions

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Update module path for v11 release line. ([#564](https://github.com/noble-assets/noble/pull/564))

ante_permissioned_liquidity.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/cosmos/cosmos-sdk/x/authz"
2424
stableswaptypes "swap.noble.xyz/types/stableswap"
2525

26-
"github.com/noble-assets/noble/v10/upgrade"
26+
"github.com/noble-assets/noble/v11/upgrade"
2727
)
2828

2929
// PermissionedAccount is the account allowed to perform liquidity actions on Noble.

api/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"swagger": "2.0",
33
"info": {
44
"title": "Noble API Reference",
5-
"version": "10.1.0"
5+
"version": "11.0.0"
66
},
77
"x-tagGroups": [
88
{

api/gen/swagger.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
swagger: '2.0'
22
info:
33
title: Noble API Reference
4-
version: 10.1.0
4+
version: 11.0.0
55
x-tagGroups:
66
- name: Circle
77
tags:

app.go

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package noble
1818

1919
import (
20-
"context"
2120
_ "embed"
2221
"fmt"
2322
"io"
@@ -46,9 +45,9 @@ import (
4645
sdk "github.com/cosmos/cosmos-sdk/types"
4746
"github.com/cosmos/cosmos-sdk/types/module"
4847
"github.com/cosmos/cosmos-sdk/x/auth/ante"
49-
"github.com/noble-assets/noble/v10/api"
50-
"github.com/noble-assets/noble/v10/jester"
51-
"github.com/noble-assets/noble/v10/upgrade"
48+
"github.com/noble-assets/noble/v11/api"
49+
"github.com/noble-assets/noble/v11/jester"
50+
"github.com/noble-assets/noble/v11/upgrade"
5251
"github.com/spf13/cast"
5352

5453
_ "cosmossdk.io/x/evidence"
@@ -469,13 +468,6 @@ func (app *App) RegisterUpgradeHandler() error {
469468
app.ModuleManager,
470469
app.Configurator(),
471470
app.Logger(),
472-
app.AccountKeeper.AddressCodec(),
473-
app.AuthorityKeeper,
474-
app.BankKeeper,
475-
app.IBCKeeper.ClientKeeper,
476-
app.DollarKeeper,
477-
app.HyperlaneKeeper,
478-
app.SwapKeeper,
479471
),
480472
)
481473

@@ -491,17 +483,6 @@ func (app *App) RegisterUpgradeHandler() error {
491483
app.SetStoreLoader(upgrade.CreateStoreLoader(upgradeInfo.Height))
492484
}
493485

494-
// To use v10.0.1 on both testnet and mainnet, we need to register an empty
495-
// handler for the last performed testnet upgrade.
496-
//
497-
// ABF150C8FC258035809E9223A7DBE2EEE2960795301D4742B10B4C2B05A06BCD
498-
app.UpgradeKeeper.SetUpgradeHandler(
499-
"v10.0.0-rc.3",
500-
func(_ context.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
501-
return vm, nil
502-
},
503-
)
504-
505486
return nil
506487
}
507488

cmd/commands.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ import (
4242
"github.com/spf13/cobra"
4343
"github.com/spf13/viper"
4444

45-
"github.com/noble-assets/noble/v10"
46-
"github.com/noble-assets/noble/v10/jester"
45+
"github.com/noble-assets/noble/v11"
46+
"github.com/noble-assets/noble/v11/jester"
4747
)
4848

4949
func addStartFlags(startCmd *cobra.Command) {

cmd/init.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import (
4848
ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
4949
soloclient "github.com/cosmos/ibc-go/v8/modules/light-clients/06-solomachine"
5050
tmclient "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
51-
"github.com/noble-assets/noble/v10"
51+
"github.com/noble-assets/noble/v11"
5252
)
5353

5454
var (

cmd/nobled/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"os"
2222

2323
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
24-
"github.com/noble-assets/noble/v10"
25-
"github.com/noble-assets/noble/v10/cmd"
24+
"github.com/noble-assets/noble/v11"
25+
"github.com/noble-assets/noble/v11/cmd"
2626
)
2727

2828
func main() {

cmd/root.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/cosmos/cosmos-sdk/types/tx/signing"
2929
"github.com/cosmos/cosmos-sdk/x/auth/tx"
3030
txmodule "github.com/cosmos/cosmos-sdk/x/auth/tx/config"
31-
"github.com/noble-assets/noble/v10/jester"
31+
"github.com/noble-assets/noble/v11/jester"
3232
"github.com/spf13/cobra"
3333
)
3434

e2e/upgrade_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ func TestChainUpgrade(t *testing.T) {
2727
t.Skip("skipping test in short mode.")
2828
}
2929

30-
genesisVersion := "v10.0.1"
30+
genesisVersion := "v10.1.0"
3131

3232
upgrades := []e2e.ChainUpgrade{
3333
{
34-
// v10.1.0 is applied as a rolling upgrade on mainnet, so no upgrade name.
35-
Image: e2e.LocalImages[0],
34+
Image: e2e.LocalImages[0],
35+
UpgradeName: "flux",
3636
},
3737
}
3838

0 commit comments

Comments
 (0)