From bf267ec96ad902d8064c1754d1f056b458b2ffcd Mon Sep 17 00:00:00 2001 From: John Letey Date: Tue, 14 May 2024 13:01:42 +0200 Subject: [PATCH] chore: update deps --- app/app.yaml | 1 + app/upgrades.go | 1 - app/upgrades/krypton/upgrade.go | 11 ++++------- go.mod | 4 ++-- go.sum | 8 ++++---- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/app/app.yaml b/app/app.yaml index fd117c68..0225e943 100644 --- a/app/app.yaml +++ b/app/app.yaml @@ -98,4 +98,5 @@ modules: - name: forwarding config: "@type": noble.forwarding.module.v1.Module + authority: authority # Utilize our custom x/authority module. # TODO(@john): TokenFactory diff --git a/app/upgrades.go b/app/upgrades.go index 4e33f476..4a4906d9 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -17,7 +17,6 @@ func (app *NobleApp) RegisterUpgradeHandlers() { app.appCodec, app.Logger(), app.GetKey(capabilitytypes.StoreKey), - app.AccountKeeper, app.AuthorityKeeper, app.CapabilityKeeper, app.IBCKeeper.ClientKeeper, diff --git a/app/upgrades/krypton/upgrade.go b/app/upgrades/krypton/upgrade.go index 4c9970ef..e1f6ec34 100644 --- a/app/upgrades/krypton/upgrade.go +++ b/app/upgrades/krypton/upgrade.go @@ -11,7 +11,6 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" consensuskeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" @@ -37,7 +36,6 @@ func CreateUpgradeHandler( cdc codec.Codec, logger log.Logger, capabilityStoreKey *storetypes.KVStoreKey, - accountKeeper authkeeper.AccountKeeper, authorityKeeper *authoritykeeper.Keeper, capabilityKeeper *capabilitykeeper.Keeper, clientKeeper clientkeeper.Keeper, @@ -115,13 +113,12 @@ func CreateUpgradeHandler( // ----- Noble Specific Logic ----- // Migrate ParamAuthority address to x/authority module. - var address string + var authority string subspace = paramsKeeper.Subspace(paramstypes.ModuleName).WithKeyTable(authoritytypes.ParamKeyTable()) //nolint:staticcheck - subspace.Get(sdkCtx, authoritytypes.AuthorityKey, &address) - authority, _ := accountKeeper.AddressCodec().StringToBytes(address) - err = authorityKeeper.Authority.Set(ctx, authority) + subspace.Get(sdkCtx, authoritytypes.AuthorityKey, &authority) + err = authorityKeeper.Owner.Set(ctx, authority) if err != nil { - return vm, errors.Wrap(err, "failed to migrate underlying authority address") + return vm, errors.Wrap(err, "failed to migrate authority address") } logger.Info(UpgradeASCII) diff --git a/go.mod b/go.mod index a59a7026..f7794f73 100644 --- a/go.mod +++ b/go.mod @@ -23,8 +23,8 @@ require ( github.com/cosmos/ibc-go/modules/capability v1.0.0 github.com/cosmos/ibc-go/v8 v8.2.1 github.com/golangci/golangci-lint v1.58.0 - github.com/noble-assets/authority v0.0.0-20240503223515-dfb231af25a2 - github.com/noble-assets/forwarding/v2 v2.0.0-20240429110930-0884f39cf30c + github.com/noble-assets/authority v0.0.0-20240514100042-ba89b7610f02 + github.com/noble-assets/forwarding/v2 v2.0.0-20240514101621-172acc02aac6 github.com/spf13/cobra v1.8.0 github.com/spf13/viper v1.18.2 mvdan.cc/gofumpt v0.6.0 diff --git a/go.sum b/go.sum index f4bcd2fc..2a64f4bc 100644 --- a/go.sum +++ b/go.sum @@ -1042,14 +1042,14 @@ github.com/nishanths/exhaustive v0.12.0 h1:vIY9sALmw6T/yxiASewa4TQcFsVYZQQRUQJhK github.com/nishanths/exhaustive v0.12.0/go.mod h1:mEZ95wPIZW+x8kC4TgC+9YCUgiST7ecevsVDTgc2obs= github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm/w98Vk= github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c= -github.com/noble-assets/authority v0.0.0-20240503223515-dfb231af25a2 h1:PbGWF8yODpAmXVcdi4qyGgV17WNcnR5+ahdMR0SMYQw= -github.com/noble-assets/authority v0.0.0-20240503223515-dfb231af25a2/go.mod h1:KR8Qz5TI/C/NhykYmhkXYOlON9z3uGKCfTfpYmcFwLA= +github.com/noble-assets/authority v0.0.0-20240514100042-ba89b7610f02 h1:C9x6j9xWHYsuL4LFNwoDMukCISRpxk+ihDagmTmoMn0= +github.com/noble-assets/authority v0.0.0-20240514100042-ba89b7610f02/go.mod h1:KR8Qz5TI/C/NhykYmhkXYOlON9z3uGKCfTfpYmcFwLA= github.com/noble-assets/cctp v0.0.0-20240416144200-ca0731aa76b1 h1:FvIJ0bztz29sQNw3wI5a18UdHj+yxUCP8WSBIgUjP3U= github.com/noble-assets/cctp v0.0.0-20240416144200-ca0731aa76b1/go.mod h1:7EdQJArIyGtv84unD3SQVmMPjvwY2/0itxaHYD4PAmA= github.com/noble-assets/fiattokenfactory v0.0.0-20240416143000-a76c29f9a0cd h1:Td5YPOup48aNKKGKUaLZUsTcWF/nmhXM1msqHlVbfBU= github.com/noble-assets/fiattokenfactory v0.0.0-20240416143000-a76c29f9a0cd/go.mod h1:L6v3Ogrfmxn+wLszi2eVOFsckIZ57o4o5ZlwwZNq+rs= -github.com/noble-assets/forwarding/v2 v2.0.0-20240429110930-0884f39cf30c h1:2+0jxMWZ0e7+HB1kGMz6F3KVYPRIrOk2f7KTKedq7qw= -github.com/noble-assets/forwarding/v2 v2.0.0-20240429110930-0884f39cf30c/go.mod h1:fkfElMT7VJZXXqywx+OE6qsEXddT/fwKX5XNdIl747U= +github.com/noble-assets/forwarding/v2 v2.0.0-20240514101621-172acc02aac6 h1:YQ6I+9F24PD9U/Q83/t/DCPwye8IeHXOrQWorPx2aSE= +github.com/noble-assets/forwarding/v2 v2.0.0-20240514101621-172acc02aac6/go.mod h1:fkfElMT7VJZXXqywx+OE6qsEXddT/fwKX5XNdIl747U= github.com/nunnatsa/ginkgolinter v0.16.2 h1:8iLqHIZvN4fTLDC0Ke9tbSZVcyVHoBs0HIbnVSxfHJk= github.com/nunnatsa/ginkgolinter v0.16.2/go.mod h1:4tWRinDN1FeJgU+iJANW/kz7xKN5nYRAOfJDQUS9dOQ= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=