Skip to content

Commit

Permalink
Rename module circletokenfactory to fiattokenfactory (#140)
Browse files Browse the repository at this point in the history
  • Loading branch information
@boojamya
boojamya authored Mar 17, 2023
1 parent 07b0d00 commit f239ebd
Show file tree
Hide file tree
Showing 195 changed files with 636 additions and 638 deletions.
56 changes: 28 additions & 28 deletions app/ante.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package app

import (
"github.com/cosmos/cosmos-sdk/types/bech32"
circletokenfactory "github.com/strangelove-ventures/noble/x/circletokenfactory/keeper"
circletokenfactorytypes "github.com/strangelove-ventures/noble/x/circletokenfactory/types"
fiattokenfactory "github.com/strangelove-ventures/noble/x/fiattokenfactory/keeper"
fiattokenfactorytypes "github.com/strangelove-ventures/noble/x/fiattokenfactory/types"
tokenfactory "github.com/strangelove-ventures/noble/x/tokenfactory/keeper"
tokenfactorytypes "github.com/strangelove-ventures/noble/x/tokenfactory/types"

Expand All @@ -18,20 +18,20 @@ import (

type HandlerOptions struct {
ante.HandlerOptions
tokenFactoryKeeper *tokenfactory.Keeper
circleTokenFactoryKeeper *circletokenfactory.Keeper
IBCKeeper *ibckeeper.Keeper
tokenFactoryKeeper *tokenfactory.Keeper
fiatTokenFactoryKeeper *fiattokenfactory.Keeper
IBCKeeper *ibckeeper.Keeper
}

type IsPausedDecorator struct {
tokenFactory *tokenfactory.Keeper
circleTokenFactory *circletokenfactory.Keeper
tokenFactory *tokenfactory.Keeper
fiatTokenFactory *fiattokenfactory.Keeper
}

func NewIsPausedDecorator(tf *tokenfactory.Keeper, ctf *circletokenfactory.Keeper) IsPausedDecorator {
func NewIsPausedDecorator(tf *tokenfactory.Keeper, ctf *fiattokenfactory.Keeper) IsPausedDecorator {
return IsPausedDecorator{
tokenFactory: tf,
circleTokenFactory: ctf,
tokenFactory: tf,
fiatTokenFactory: ctf,
}
}

Expand All @@ -43,22 +43,22 @@ func (ad IsPausedDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool
switch m := m.(type) {
case *banktypes.MsgSend:
for _, c := range m.Amount {
paused, err := checkPausedStatebyTokenFactory(ctx, c, ad.tokenFactory, ad.circleTokenFactory)
paused, err := checkPausedStatebyTokenFactory(ctx, c, ad.tokenFactory, ad.fiatTokenFactory)
if paused {
return ctx, sdkerrors.Wrapf(err, "can not perform token transfers")
}
}
case *banktypes.MsgMultiSend:
for _, i := range m.Inputs {
for _, c := range i.Coins {
paused, err := checkPausedStatebyTokenFactory(ctx, c, ad.tokenFactory, ad.circleTokenFactory)
paused, err := checkPausedStatebyTokenFactory(ctx, c, ad.tokenFactory, ad.fiatTokenFactory)
if paused {
return ctx, sdkerrors.Wrapf(err, "can not perform token transfers")
}
}
}
case *transfertypes.MsgTransfer:
paused, err := checkPausedStatebyTokenFactory(ctx, m.Token, ad.tokenFactory, ad.circleTokenFactory)
paused, err := checkPausedStatebyTokenFactory(ctx, m.Token, ad.tokenFactory, ad.fiatTokenFactory)
if paused {
return ctx, sdkerrors.Wrapf(err, "can not perform token transfers")
}
Expand All @@ -72,7 +72,7 @@ func (ad IsPausedDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool
return next(ctx, tx, simulate)
}

func checkPausedStatebyTokenFactory(ctx sdk.Context, c sdk.Coin, tf *tokenfactory.Keeper, ctf *circletokenfactory.Keeper) (bool, *sdkerrors.Error) {
func checkPausedStatebyTokenFactory(ctx sdk.Context, c sdk.Coin, tf *tokenfactory.Keeper, ctf *fiattokenfactory.Keeper) (bool, *sdkerrors.Error) {
tfMintingDenom := tf.GetMintingDenom(ctx)
if c.Denom == tfMintingDenom.Denom {
paused := tf.GetPaused(ctx)
Expand All @@ -84,21 +84,21 @@ func checkPausedStatebyTokenFactory(ctx sdk.Context, c sdk.Coin, tf *tokenfactor
if c.Denom == ctfMintingDenom.Denom {
paused := ctf.GetPaused(ctx)
if paused.Paused {
return true, circletokenfactorytypes.ErrPaused
return true, fiattokenfactorytypes.ErrPaused
}
}
return false, nil
}

type IsBlacklistedDecorator struct {
tokenfactory *tokenfactory.Keeper
circletokenfactory *circletokenfactory.Keeper
tokenfactory *tokenfactory.Keeper
fiattokenfactory *fiattokenfactory.Keeper
}

func NewIsBlacklistedDecorator(tf *tokenfactory.Keeper, ctf *circletokenfactory.Keeper) IsBlacklistedDecorator {
func NewIsBlacklistedDecorator(tf *tokenfactory.Keeper, ctf *fiattokenfactory.Keeper) IsBlacklistedDecorator {
return IsBlacklistedDecorator{
tokenfactory: tf,
circletokenfactory: ctf,
tokenfactory: tf,
fiattokenfactory: ctf,
}
}

Expand All @@ -111,7 +111,7 @@ func (ad IsBlacklistedDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate
case *banktypes.MsgSend:
for _, c := range m.Amount {
addresses := []string{m.ToAddress, m.FromAddress}
blacklisted, address, err := checkForBlacklistedAddressByTokenFactory(ctx, addresses, c, ad.tokenfactory, ad.circletokenfactory)
blacklisted, address, err := checkForBlacklistedAddressByTokenFactory(ctx, addresses, c, ad.tokenfactory, ad.fiattokenfactory)
if blacklisted {
return ctx, sdkerrors.Wrapf(err, "an address (%s) is blacklisted and can not send or receive tokens", address)
}
Expand All @@ -123,7 +123,7 @@ func (ad IsBlacklistedDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate
for _, i := range m.Inputs {
for _, c := range i.Coins {
addresses := []string{i.Address}
blacklisted, address, err := checkForBlacklistedAddressByTokenFactory(ctx, addresses, c, ad.tokenfactory, ad.circletokenfactory)
blacklisted, address, err := checkForBlacklistedAddressByTokenFactory(ctx, addresses, c, ad.tokenfactory, ad.fiattokenfactory)
if blacklisted {
return ctx, sdkerrors.Wrapf(err, "an address (%s) is blacklisted and can not send or receive tokens", address)
}
Expand All @@ -135,7 +135,7 @@ func (ad IsBlacklistedDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate
for _, o := range m.Outputs {
for _, c := range o.Coins {
addresses := []string{o.Address}
blacklisted, address, err := checkForBlacklistedAddressByTokenFactory(ctx, addresses, c, ad.tokenfactory, ad.circletokenfactory)
blacklisted, address, err := checkForBlacklistedAddressByTokenFactory(ctx, addresses, c, ad.tokenfactory, ad.fiattokenfactory)
if blacklisted {
return ctx, sdkerrors.Wrapf(err, "an address (%s) is blacklisted and can not send or receive tokens", address)
}
Expand All @@ -146,7 +146,7 @@ func (ad IsBlacklistedDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate
}
case *transfertypes.MsgTransfer:
addresses := []string{m.Sender, m.Receiver}
blacklisted, address, err := checkForBlacklistedAddressByTokenFactory(ctx, addresses, m.Token, ad.tokenfactory, ad.circletokenfactory)
blacklisted, address, err := checkForBlacklistedAddressByTokenFactory(ctx, addresses, m.Token, ad.tokenfactory, ad.fiattokenfactory)
if blacklisted {
return ctx, sdkerrors.Wrapf(err, "an address (%s) is blacklisted and can not send or receive tokens", address)
}
Expand All @@ -163,7 +163,7 @@ func (ad IsBlacklistedDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate

// checkForBlacklistedAddressByTokenFactory first checks if the denom being transacted is a mintable asset from a TokenFactory,
// if it is, it checks if the addresses involved in the tx are blacklisted by that specific TokenFactory.
func checkForBlacklistedAddressByTokenFactory(ctx sdk.Context, addresses []string, c sdk.Coin, tf *tokenfactory.Keeper, ctf *circletokenfactory.Keeper) (blacklisted bool, blacklistedAddress string, err error) {
func checkForBlacklistedAddressByTokenFactory(ctx sdk.Context, addresses []string, c sdk.Coin, tf *tokenfactory.Keeper, ctf *fiattokenfactory.Keeper) (blacklisted bool, blacklistedAddress string, err error) {
tfMintingDenom := tf.GetMintingDenom(ctx)
if c.Denom == tfMintingDenom.Denom {
for _, address := range addresses {
Expand All @@ -186,7 +186,7 @@ func checkForBlacklistedAddressByTokenFactory(ctx sdk.Context, addresses []strin
}
_, found := ctf.GetBlacklisted(ctx, addressBz)
if found {
return true, address, circletokenfactorytypes.ErrUnauthorized
return true, address, fiattokenfactorytypes.ErrUnauthorized
}
}
}
Expand Down Expand Up @@ -214,8 +214,8 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
anteDecorators := []sdk.AnteDecorator{
ante.NewSetUpContextDecorator(), // outermost AnteDecorator. SetUpContext must be called first
ante.NewRejectExtensionOptionsDecorator(),
NewIsBlacklistedDecorator(options.tokenFactoryKeeper, options.circleTokenFactoryKeeper),
NewIsPausedDecorator(options.tokenFactoryKeeper, options.circleTokenFactoryKeeper),
NewIsBlacklistedDecorator(options.tokenFactoryKeeper, options.fiatTokenFactoryKeeper),
NewIsPausedDecorator(options.tokenFactoryKeeper, options.fiatTokenFactoryKeeper),
ante.NewMempoolFeeDecorator(),
ante.NewValidateBasicDecorator(),
ante.NewTxTimeoutHeightDecorator(),
Expand Down
60 changes: 30 additions & 30 deletions app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ import (
"github.com/strangelove-ventures/noble/cmd"
"github.com/strangelove-ventures/noble/docs"
"github.com/strangelove-ventures/noble/x/blockibc"
circletokenfactorymodule "github.com/strangelove-ventures/noble/x/circletokenfactory"
circletokenfactorymodulekeeper "github.com/strangelove-ventures/noble/x/circletokenfactory/keeper"
circletokenfactorymoduletypes "github.com/strangelove-ventures/noble/x/circletokenfactory/types"
fiattokenfactorymodule "github.com/strangelove-ventures/noble/x/fiattokenfactory"
fiattokenfactorymodulekeeper "github.com/strangelove-ventures/noble/x/fiattokenfactory/keeper"
fiattokenfactorymoduletypes "github.com/strangelove-ventures/noble/x/fiattokenfactory/types"
tokenfactorymodule "github.com/strangelove-ventures/noble/x/tokenfactory"
tokenfactorymodulekeeper "github.com/strangelove-ventures/noble/x/tokenfactory/keeper"
tokenfactorymoduletypes "github.com/strangelove-ventures/noble/x/tokenfactory/types"
Expand Down Expand Up @@ -134,22 +134,22 @@ var (
ica.AppModuleBasic{},
vesting.AppModuleBasic{},
tokenfactorymodule.AppModuleBasic{},
circletokenfactorymodule.AppModuleBasic{},
fiattokenfactorymodule.AppModuleBasic{},
packetforward.AppModuleBasic{},

// this line is used by starport scaffolding # stargate/app/moduleBasic
)

// module account permissions
maccPerms = map[string][]string{
authtypes.FeeCollectorName: nil,
distrtypes.ModuleName: nil,
icatypes.ModuleName: nil,
ibctransfertypes.ModuleName: {authtypes.Minter, authtypes.Burner},
tokenfactorymoduletypes.ModuleName: {authtypes.Minter, authtypes.Burner, authtypes.Staking},
circletokenfactorymoduletypes.ModuleName: {authtypes.Minter, authtypes.Burner, authtypes.Staking},
stakingtypes.BondedPoolName: {authtypes.Burner, authtypes.Staking},
stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking},
authtypes.FeeCollectorName: nil,
distrtypes.ModuleName: nil,
icatypes.ModuleName: nil,
ibctransfertypes.ModuleName: {authtypes.Minter, authtypes.Burner},
tokenfactorymoduletypes.ModuleName: {authtypes.Minter, authtypes.Burner, authtypes.Staking},
fiattokenfactorymoduletypes.ModuleName: {authtypes.Minter, authtypes.Burner, authtypes.Staking},
stakingtypes.BondedPoolName: {authtypes.Burner, authtypes.Staking},
stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking},
// this line is used by starport scaffolding # stargate/app/maccPerms
}
)
Expand Down Expand Up @@ -210,8 +210,8 @@ type App struct {
ScopedICAHostKeeper capabilitykeeper.ScopedKeeper
ScopedCCVConsumerKeeper capabilitykeeper.ScopedKeeper

TokenFactoryKeeper *tokenfactorymodulekeeper.Keeper
CircleTokenFactoryKeeper *circletokenfactorymodulekeeper.Keeper
TokenFactoryKeeper *tokenfactorymodulekeeper.Keeper
FiatTokenFactoryKeeper *fiattokenfactorymodulekeeper.Keeper

// this line is used by starport scaffolding # stargate/app/keeperDeclaration

Expand Down Expand Up @@ -249,7 +249,7 @@ func New(
authtypes.StoreKey, authz.ModuleName, banktypes.StoreKey, slashingtypes.StoreKey, distrtypes.StoreKey,
paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey, evidencetypes.StoreKey,
ibctransfertypes.StoreKey, icahosttypes.StoreKey, capabilitytypes.StoreKey,
tokenfactorymoduletypes.StoreKey, circletokenfactorymoduletypes.StoreKey, packetforwardtypes.StoreKey, stakingtypes.StoreKey,
tokenfactorymoduletypes.StoreKey, fiattokenfactorymoduletypes.StoreKey, packetforwardtypes.StoreKey, stakingtypes.StoreKey,
)
tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
Expand Down Expand Up @@ -432,14 +432,14 @@ func New(
)
tokenfactoryModule := tokenfactorymodule.NewAppModule(appCodec, app.TokenFactoryKeeper, app.AccountKeeper, app.BankKeeper)

app.CircleTokenFactoryKeeper = circletokenfactorymodulekeeper.NewKeeper(
app.FiatTokenFactoryKeeper = fiattokenfactorymodulekeeper.NewKeeper(
appCodec,
keys[circletokenfactorymoduletypes.StoreKey],
app.GetSubspace(circletokenfactorymoduletypes.ModuleName),
keys[fiattokenfactorymoduletypes.StoreKey],
app.GetSubspace(fiattokenfactorymoduletypes.ModuleName),

app.BankKeeper,
)
circletokenfactorymodule := circletokenfactorymodule.NewAppModule(appCodec, app.CircleTokenFactoryKeeper, app.AccountKeeper, app.BankKeeper)
fiattokenfactorymodule := fiattokenfactorymodule.NewAppModule(appCodec, app.FiatTokenFactoryKeeper, app.AccountKeeper, app.BankKeeper)

var transferStack ibcporttypes.IBCModule
transferStack = transfer.NewIBCModule(app.TransferKeeper)
Expand All @@ -450,7 +450,7 @@ func New(
packetforwardkeeper.DefaultForwardTransferPacketTimeoutTimestamp,
packetforwardkeeper.DefaultRefundTransferPacketTimeoutTimestamp,
)
transferStack = blockibc.NewIBCMiddleware(transferStack, app.TokenFactoryKeeper, app.CircleTokenFactoryKeeper)
transferStack = blockibc.NewIBCMiddleware(transferStack, app.TokenFactoryKeeper, app.FiatTokenFactoryKeeper)

// Create static IBC router, add transfer route, then set and seal it
ibcRouter := ibcporttypes.NewRouter()
Expand Down Expand Up @@ -490,7 +490,7 @@ func New(
transferModule,
icaModule,
tokenfactoryModule,
circletokenfactorymodule,
fiattokenfactorymodule,
packetforward.NewAppModule(app.PacketForwardKeeper),
staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper),
// this line is used by starport scaffolding # stargate/app/appModule
Expand Down Expand Up @@ -521,7 +521,7 @@ func New(
paramstypes.ModuleName,
vestingtypes.ModuleName,
tokenfactorymoduletypes.ModuleName,
circletokenfactorymoduletypes.ModuleName,
fiattokenfactorymoduletypes.ModuleName,
// this line is used by starport scaffolding # stargate/app/beginBlockers
)

Expand All @@ -545,7 +545,7 @@ func New(
upgradetypes.ModuleName,
vestingtypes.ModuleName,
tokenfactorymoduletypes.ModuleName,
circletokenfactorymoduletypes.ModuleName,
fiattokenfactorymoduletypes.ModuleName,
// this line is used by starport scaffolding # stargate/app/endBlockers
)

Expand Down Expand Up @@ -574,7 +574,7 @@ func New(
upgradetypes.ModuleName,
vestingtypes.ModuleName,
tokenfactorymoduletypes.ModuleName,
circletokenfactorymoduletypes.ModuleName,
fiattokenfactorymoduletypes.ModuleName,
// this line is used by starport scaffolding # stargate/app/initGenesis
)

Expand All @@ -601,7 +601,7 @@ func New(
ibc.NewAppModule(app.IBCKeeper),
transferModule,
tokenfactoryModule,
circletokenfactorymodule,
fiattokenfactorymodule,
// this line is used by starport scaffolding # stargate/app/appModule
)
app.sm.RegisterStoreDecoders()
Expand All @@ -621,8 +621,8 @@ func New(
SignModeHandler: encodingConfig.TxConfig.SignModeHandler(),
SigGasConsumer: ante.DefaultSigVerificationGasConsumer,
},
tokenFactoryKeeper: app.TokenFactoryKeeper,
circleTokenFactoryKeeper: app.CircleTokenFactoryKeeper,
tokenFactoryKeeper: app.TokenFactoryKeeper,
fiatTokenFactoryKeeper: app.FiatTokenFactoryKeeper,

IBCKeeper: app.IBCKeeper,
},
Expand Down Expand Up @@ -802,7 +802,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
paramsKeeper.Subspace(ibchost.ModuleName)
paramsKeeper.Subspace(icahosttypes.SubModuleName)
paramsKeeper.Subspace(tokenfactorymoduletypes.ModuleName)
paramsKeeper.Subspace(circletokenfactorymoduletypes.ModuleName)
paramsKeeper.Subspace(fiattokenfactorymoduletypes.ModuleName)
paramsKeeper.Subspace(upgradetypes.ModuleName)
// this line is used by starport scaffolding # stargate/app/paramSubspace

Expand All @@ -816,7 +816,7 @@ func (app *App) setupUpgradeHandlers() {
neon.CreateNeonUpgradeHandler(
app.mm,
app.configurator,
*app.CircleTokenFactoryKeeper,
*app.FiatTokenFactoryKeeper,
app.BankKeeper,
app.AccountKeeper))

Expand All @@ -833,7 +833,7 @@ func (app *App) setupUpgradeHandlers() {
switch upgradeInfo.Name {
case neon.UpgradeName:
stroreUpgrades = &storetypes.StoreUpgrades{
Added: []string{circletokenfactorymoduletypes.StoreKey},
Added: []string{fiattokenfactorymoduletypes.StoreKey},
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/neon/constants.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ const (
// UpgradeName is the shared upgrade plan name for mainnet
UpgradeName = "neon"
// UpgradeInfo defines the binaries that will be used for the upgrade
UpgradeInfo = "Release tag: https://github.com/strangelove-ventures/noble/releases/tag/v0.4.0"
UpgradeInfo = "Release tag: https://github.com/strangelove-ventures/noble/releases/tag/v0.4.1"
)
Loading

0 comments on commit f239ebd

Please sign in to comment.