Skip to content

Commit

Permalink
no need to do authz authorization
Browse files Browse the repository at this point in the history
  • Loading branch information
okdas committed Nov 27, 2024
1 parent a7573b8 commit bc2a3c4
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 39 deletions.
2 changes: 1 addition & 1 deletion api/poktroll/application/event.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/poktroll/application/types.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/poktroll/supplier/event.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/poktroll/supplier/tx.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/poktroll/tokenomics/event.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/poktroll/tokenomics/types.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
var allUpgrades = []upgrades.Upgrade{
upgrades.Upgrade_0_0_4,
upgrades.Upgrade_0_0_10,
upgrades.Upgrade_0_0_11,
}

// setUpgrades sets upgrade handlers for all upgrades and executes KVStore migration if an upgrade plan file exists.
Expand Down
55 changes: 22 additions & 33 deletions app/upgrades/v0.0.11.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@ package upgrades

import (
"context"
"fmt"
"time"

storetypes "cosmossdk.io/store/types"
upgradetypes "cosmossdk.io/x/upgrade/types"
cosmosTypes "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
"github.com/cosmos/cosmos-sdk/x/authz"
"github.com/pokt-network/poktroll/app/keepers"
tokenomicstypes "github.com/pokt-network/poktroll/x/tokenomics/types"
)
Expand All @@ -28,18 +25,25 @@ var Upgrade_0_0_11 = Upgrade{
// Adds new parameters using ignite's config.yml as a reference. Assuming we don't need any other parameters.
// https://github.com/pokt-network/poktroll/compare/v0.0.10...v0.0.11-rc
applyNewParameters := func(ctx context.Context) (err error) {
logger := cosmosTypes.UnwrapSDKContext(ctx).Logger()
logger.Info("Starting parameter updates for v0.0.11")

// Set num_suppliers_per_session to 15
// Validate with: `poktrolld q session params --node=https://testnet-validated-validator-rpc.poktroll.com/`
sessionParams := keepers.SessionKeeper.GetParams(ctx)
logger.Info("Current session params", "params", sessionParams)
sessionParams.NumSuppliersPerSession = uint64(15)
err = keepers.SessionKeeper.SetParams(ctx, sessionParams)
if err != nil {
logger.Error("Failed to set session params", "error", err)
return err
}
logger.Info("Successfully updated session params", "new_params", sessionParams)

// Set tokenomics params. The values are based on default values for LocalNet.
// Validate with: `poktrolld q tokenomics params --node=https://testnet-validated-validator-rpc.poktroll.com/`
tokenomicsParams := keepers.TokenomicsKeeper.GetParams(ctx)
logger.Info("Current tokenomics params", "params", tokenomicsParams)
tokenomicsParams.MintAllocationPercentages = tokenomicstypes.MintAllocationPercentages{
Dao: 0.1,
Proposer: 0.05,
Expand All @@ -50,53 +54,38 @@ var Upgrade_0_0_11 = Upgrade{
tokenomicsParams.DaoRewardAddress = AlphaTestNetPnfAddress
err = keepers.TokenomicsKeeper.SetParams(ctx, tokenomicsParams)
if err != nil {
logger.Error("Failed to set tokenomics params", "error", err)
return err
}
return
}

// Adds new authz authorizations from the diff:
// https://github.com/pokt-network/poktroll/compare/v0.0.10...v0.0.11-rc
applyNewAuthorizations := func(ctx context.Context) (err error) {
// Validate with:
// `poktrolld q authz grants-by-granter pokt10d07y265gmmuvt4z0w9aw880jnsr700j8yv32t --node=https://testnet-validated-validator-rpc.poktroll.com/`
grantAuthorizationMessages := []string{
"/poktroll.session.MsgUpdateParam",
}
logger.Info("Successfully updated tokenomics params", "new_params", tokenomicsParams)

expiration, err := time.Parse(time.RFC3339, "2500-01-01T00:00:00Z")
if err != nil {
return fmt.Errorf("failed to parse time: %w", err)
}

for _, msg := range grantAuthorizationMessages {
err = keepers.AuthzKeeper.SaveGrant(
ctx,
cosmosTypes.AccAddress(AlphaTestNetPnfAddress),
cosmosTypes.AccAddress(AlphaTestNetAuthorityAddress),
authz.NewGenericAuthorization(msg),
&expiration,
)
if err != nil {
return fmt.Errorf("failed to save grant for message %s: %w", msg, err)
}
}
return
}

// The diff shows that the only new authz authorization is for the `poktroll.session.MsgUpdateParam` message.
// However, this message is already authorized for the `pokt10d07y265gmmuvt4z0w9aw880jnsr700j8yv32t` address.
// See here: poktrolld q authz grants-by-granter pokt10d07y265gmmuvt4z0w9aw880jnsr700j8yv32t --node=https://shannon-testnet-grove-seed-rpc.alpha.poktroll.com

// Returns the upgrade handler for v0.0.11
return func(ctx context.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
logger := cosmosTypes.UnwrapSDKContext(ctx).Logger()
logger.Info("Starting v0.0.11 upgrade handler")

err := applyNewParameters(ctx)
if err != nil {
logger.Error("Failed to apply new parameters", "error", err)
return vm, err
}

err = applyNewAuthorizations(ctx)
logger.Info("Running module migrations")
vm, err = mm.RunMigrations(ctx, configurator, vm)
if err != nil {
logger.Error("Failed to run migrations", "error", err)
return vm, err
}

return mm.RunMigrations(ctx, configurator, vm)
logger.Info("Successfully completed v0.0.11 upgrade handler")
return vm, nil
}
},
// No changes to the KVStore in this upgrade.
Expand Down

0 comments on commit bc2a3c4

Please sign in to comment.