Skip to content

Commit

Permalink
chore: miscellaneous improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
johnletey committed Oct 4, 2024
1 parent bea2d07 commit ecfe26a
Show file tree
Hide file tree
Showing 19 changed files with 225 additions and 300 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.PHONY: proto-format proto-lint proto-breaking proto-gen format lint test-unit build local-image test-e2e
all: proto-all format test-unit build local-image test-e2e
all: proto-all format lint test-unit build local-image test-e2e

###############################################################################
### Build ###
Expand Down
6 changes: 4 additions & 2 deletions simapp/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,15 @@ func NewSimApp(
return nil, err
}
app.AuraKeeper = aurakeeper.NewKeeper(
runtime.NewKVStoreService(app.GetKey(auratypes.ModuleName)),
"ausdy",
runtime.NewKVStoreService(app.GetKey(auratypes.ModuleName)),
runtime.ProvideEventService(),
app.AccountKeeper.AddressCodec(),
nil,
)
app.BankKeeper.AppendSendRestriction(app.AuraKeeper.SendRestrictionFn)
app.AuraKeeper.SetBankKeeper(app.BankKeeper)
if err := app.RegisterModules(aura.NewAppModule(app.AuraKeeper)); err != nil {
if err := app.RegisterModules(aura.NewAppModule(app.AccountKeeper.AddressCodec(), app.AuraKeeper)); err != nil {
return nil, err
}

Expand Down
2 changes: 1 addition & 1 deletion simapp/simd/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ func NewRootCmd() *cobra.Command {
ibcexported.ModuleName: ibc.AppModule{},
transfertypes.ModuleName: transfer.AppModule{},
tendermint.ModuleName: tendermint.AppModule{},
auratypes.ModuleName: aura.AppModule{},
auratypes.ModuleName: aura.NewAppModule(autoCliOpts.AddressCodec, nil),
}
for name, mod := range modules {
moduleBasicManager[name] = module.CoreAppModuleBasicAdaptor(name, mod)
Expand Down
5 changes: 4 additions & 1 deletion utils/mocks/aura.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package mocks

import (
storetypes "cosmossdk.io/store/types"
"github.com/cosmos/cosmos-sdk/codec/address"
"github.com/cosmos/cosmos-sdk/runtime"
"github.com/cosmos/cosmos-sdk/testutil"
sdk "github.com/cosmos/cosmos-sdk/types"
Expand All @@ -20,8 +21,10 @@ func AuraKeeperWithBank(bank BankKeeper) (*keeper.Keeper, sdk.Context) {
tkey := storetypes.NewTransientStoreKey("transient_aura")

k := keeper.NewKeeper(
runtime.NewKVStoreService(key),
"ausdy",
runtime.NewKVStoreService(key),
runtime.ProvideEventService(),
address.NewBech32Codec("noble"),
nil,
)

Expand Down
5 changes: 3 additions & 2 deletions x/aura/genesis.go
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
package aura

import (
"cosmossdk.io/core/address"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/keeper"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist"
)

func InitGenesis(ctx sdk.Context, k *keeper.Keeper, genesis types.GenesisState) {
func InitGenesis(ctx sdk.Context, k *keeper.Keeper, addressCodec address.Codec, genesis types.GenesisState) {
k.SetBlocklistOwner(ctx, genesis.BlocklistState.Owner)
k.SetBlocklistPendingOwner(ctx, genesis.BlocklistState.PendingOwner)
for _, account := range genesis.BlocklistState.BlockedAddresses {
address, _ := sdk.AccAddressFromBech32(account)
address, _ := addressCodec.StringToBytes(account)
k.SetBlockedAddress(ctx, address)
}

Expand Down
20 changes: 15 additions & 5 deletions x/aura/keeper/keeper.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,39 @@ import (
"context"
"fmt"

"cosmossdk.io/core/address"
"cosmossdk.io/core/event"
"cosmossdk.io/core/store"
sdk "github.com/cosmos/cosmos-sdk/types"
transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
)

type Keeper struct {
Denom string

storeService store.KVStoreService
eventService event.Service

Denom string
bankKeeper types.BankKeeper
addressCodec address.Codec
bankKeeper types.BankKeeper
}

func NewKeeper(
storeService store.KVStoreService,
denom string,
storeService store.KVStoreService,
eventService event.Service,
addressCodec address.Codec,
bankKeeper types.BankKeeper,
) *Keeper {
return &Keeper{
Denom: denom,

storeService: storeService,
eventService: eventService,

Denom: denom,
bankKeeper: bankKeeper,
addressCodec: addressCodec,
bankKeeper: bankKeeper,
}
}

Expand Down
Loading

0 comments on commit ecfe26a

Please sign in to comment.