Skip to content

Commit d5b6904

Browse files
akhilkumarpilliakhilkumarpilli
committed
WIP: fixed app package changes and working on cmd
1 parent 04650f4 commit d5b6904

33 files changed

Lines changed: 542 additions & 645 deletions

‎ante/ante_feeabs_feemarket.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,16 @@ var _ feemarkettypes.DenomResolver = &DenomResolverImpl{}
2121
// If the denom is the bond denom, convert `coin` to the native denom. return error if coin.Denom is not in the allowed list
2222
// If the denom is not the bond denom, convert the `coin` to the given denom. return error if denom is not in the allowed list
2323
func (r *DenomResolverImpl) ConvertToDenom(ctx sdk.Context, coin sdk.DecCoin, denom string) (sdk.DecCoin, error) {
24-
bondDenom := r.StakingKeeper.BondDenom(ctx)
24+
bondDenom, err := r.StakingKeeper.BondDenom(ctx)
25+
if err != nil {
26+
return sdk.DecCoin{}, err
27+
}
2528
if denom != bondDenom && coin.Denom != bondDenom {
2629
return sdk.DecCoin{}, ErrNeitherNativeDenom(coin.Denom, denom)
2730
}
2831
var amount sdk.Coins
2932
var hostZoneConfig feeabstypes.HostChainFeeAbsConfig
3033
var found bool
31-
var err error
3234

3335
if denom == bondDenom {
3436
hostZoneConfig, found = r.FeeabsKeeper.GetHostZoneConfig(ctx, coin.Denom)

‎ante/expected_keepers.go‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,16 @@
11
package ante
22

33
import (
4+
"context"
5+
6+
"cosmossdk.io/core/address"
47
didtypes "github.com/cheqd/cheqd-node/x/did/types"
58
resourcetypes "github.com/cheqd/cheqd-node/x/resource/types"
69
sdk "github.com/cosmos/cosmos-sdk/types"
710
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
811
feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types"
912
)
1013

11-
type BankKeeper interface {
12-
GetBalance(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin
13-
14-
SendCoins(ctx sdk.Context, from, to sdk.AccAddress, amt sdk.Coins) error
15-
SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error
16-
SendCoinsFromModuleToModule(ctx sdk.Context, senderModule, recipientModule string, amt sdk.Coins) error
17-
BurnCoins(ctx sdk.Context, name string, amt sdk.Coins) error
18-
IsSendEnabledCoins(ctx sdk.Context, coins ...sdk.Coin) error
19-
SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error
20-
}
21-
2214
type DidKeeper interface {
2315
GetParams(ctx sdk.Context) (params didtypes.FeeParams)
2416
}
@@ -27,22 +19,23 @@ type ResourceKeeper interface {
2719
GetParams(ctx sdk.Context) (params resourcetypes.FeeParams)
2820
}
2921
type AccountKeeper interface {
30-
GetParams(ctx sdk.Context) (params authtypes.Params)
31-
GetAccount(ctx sdk.Context, addr sdk.AccAddress) authtypes.AccountI
32-
SetAccount(ctx sdk.Context, acc authtypes.AccountI)
22+
GetParams(ctx context.Context) (params authtypes.Params)
23+
GetAccount(ctx context.Context, addr sdk.AccAddress) sdk.AccountI
24+
SetAccount(ctx context.Context, acc sdk.AccountI)
3325
GetModuleAddress(moduleName string) sdk.AccAddress
34-
GetModuleAccount(ctx sdk.Context, name string) authtypes.ModuleAccountI
35-
NewAccountWithAddress(ctx sdk.Context, addr sdk.AccAddress) authtypes.AccountI
26+
GetModuleAccount(ctx context.Context, name string) sdk.ModuleAccountI
27+
NewAccountWithAddress(ctx context.Context, addr sdk.AccAddress) sdk.AccountI
28+
AddressCodec() address.Codec
3629
}
3730
type FeeGrantKeeper interface {
38-
UseGrantedFees(ctx sdk.Context, granter, grantee sdk.AccAddress, fee sdk.Coins, msgs []sdk.Msg) error
31+
UseGrantedFees(ctx context.Context, granter, grantee sdk.AccAddress, fee sdk.Coins, msgs []sdk.Msg) error
3932
}
4033

4134
type FeeMarketKeeper interface {
42-
GetState(ctx sdk.Context) (feemarkettypes.State, error)
43-
GetMinGasPrice(ctx sdk.Context, denom string) (sdk.DecCoin, error)
44-
GetParams(ctx sdk.Context) (feemarkettypes.Params, error)
45-
SetState(ctx sdk.Context, state feemarkettypes.State) error
46-
SetParams(ctx sdk.Context, params feemarkettypes.Params) error
47-
ResolveToDenom(ctx sdk.Context, coin sdk.DecCoin, denom string) (sdk.DecCoin, error)
35+
GetState(ctx context.Context) (feemarkettypes.State, error)
36+
GetMinGasPrice(ctx context.Context, denom string) (sdk.DecCoin, error)
37+
GetParams(ctx context.Context) (feemarkettypes.Params, error)
38+
SetState(ctx context.Context, state feemarkettypes.State) error
39+
SetParams(ctx context.Context, params feemarkettypes.Params) error
40+
ResolveToDenom(ctx context.Context, coin sdk.DecCoin, denom string) (sdk.DecCoin, error)
4841
}

‎ante/tx_msg_filters.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package ante
33
import (
44
"strings"
55

6+
sdkmath "cosmossdk.io/math"
67
didtypes "github.com/cheqd/cheqd-node/x/did/types"
78
resourcetypes "github.com/cheqd/cheqd-node/x/resource/types"
89
resourceutils "github.com/cheqd/cheqd-node/x/resource/utils"
@@ -29,7 +30,7 @@ const (
2930

3031
type TaxableMsgFee = [TaxableMsgFeeCount]sdk.Coins
3132

32-
type BurnFactor = [BurnFactorCount]sdk.Dec
33+
type BurnFactor = [BurnFactorCount]sdkmath.LegacyDec
3334

3435
var TaxableMsgFees = TaxableMsgFee{
3536
MsgCreateDidDoc: (sdk.Coins)(nil),
@@ -41,8 +42,8 @@ var TaxableMsgFees = TaxableMsgFee{
4142
}
4243

4344
var BurnFactors = BurnFactor{
44-
BurnFactorDid: sdk.NewDec(0),
45-
BurnFactorResource: sdk.NewDec(0),
45+
BurnFactorDid: sdkmath.LegacyNewDec(0),
46+
BurnFactorResource: sdkmath.LegacyNewDec(0),
4647
}
4748

4849
func GetTaxableMsg(msg interface{}) bool {

‎api/go.mod‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/cheqd/cheqd-node/api/v2
22

3-
go 1.22.6
4-
5-
toolchain go1.23.4
3+
go 1.23.8
64

75
require (
86
cosmossdk.io/api v0.7.6
@@ -17,8 +15,8 @@ require (
1715
github.com/golang/protobuf v1.5.4 // indirect
1816
github.com/google/go-cmp v0.6.0 // indirect
1917
golang.org/x/net v0.33.0 // indirect
20-
golang.org/x/sys v0.28.0 // indirect
21-
golang.org/x/text v0.21.0 // indirect
18+
golang.org/x/sys v0.31.0 // indirect
19+
golang.org/x/text v0.23.0 // indirect
2220
google.golang.org/genproto/googleapis/rpc v0.0.0-20240930140551-af27646dc61f // indirect
2321
)
2422

‎api/go.sum‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
1010
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
1111
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
1212
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
13-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
14-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
15-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
16-
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
13+
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
14+
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
15+
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
16+
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
1717
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8=
18+
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo=
1819
google.golang.org/genproto/googleapis/rpc v0.0.0-20240930140551-af27646dc61f h1:cUMEy+8oS78BWIH9OWazBkzbr090Od9tWBNtZHkOhf0=
20+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240930140551-af27646dc61f/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
1921
google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
22+
google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
2023
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
2124
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=

‎app/ante.go‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@ package app
22

33
import (
44
errorsmod "cosmossdk.io/errors"
5+
storetypes "cosmossdk.io/store/types"
6+
circuitante "cosmossdk.io/x/circuit/ante"
7+
txsigning "cosmossdk.io/x/tx/signing"
58
cheqdante "github.com/cheqd/cheqd-node/ante"
69
sdk "github.com/cosmos/cosmos-sdk/types"
710
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
811
"github.com/cosmos/cosmos-sdk/types/tx/signing"
912
"github.com/cosmos/cosmos-sdk/x/auth/ante"
10-
authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
1113
"github.com/cosmos/cosmos-sdk/x/auth/types"
14+
bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
1215
ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
1316
ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
1417
feeabsante "github.com/osmosis-labs/fee-abstraction/v8/x/feeabs/ante"
@@ -21,17 +24,18 @@ import (
2124
// Here we add the cheqd ante decorators, which extend default SDK AnteHandler.
2225
type HandlerOptions struct {
2326
AccountKeeper cheqdante.AccountKeeper
24-
BankKeeper cheqdante.BankKeeper
27+
BankKeeper bankkeeper.Keeper
2528
ExtensionOptionChecker ante.ExtensionOptionChecker
2629
FeegrantKeeper ante.FeegrantKeeper
27-
SignModeHandler authsigning.SignModeHandler
28-
SigGasConsumer func(meter sdk.GasMeter, sig signing.SignatureV2, params types.Params) error
30+
SignModeHandler *txsigning.HandlerMap
31+
SigGasConsumer func(meter storetypes.GasMeter, sig signing.SignatureV2, params types.Params) error
2932
TxFeeChecker ante.TxFeeChecker
3033
IBCKeeper *ibckeeper.Keeper
3134
DidKeeper cheqdante.DidKeeper
3235
ResourceKeeper cheqdante.ResourceKeeper
3336
FeeAbskeeper feeabskeeper.Keeper
3437
FeeMarketKeeper *feemarketkeeper.Keeper
38+
CircuitKeeper circuitante.CircuitBreaker
3539
}
3640

3741
// NewAnteHandler returns an AnteHandler that checks and increments sequence
@@ -56,6 +60,7 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
5660

5761
anteDecorators := []sdk.AnteDecorator{
5862
ante.NewSetUpContextDecorator(), // outermost AnteDecorator. SetUpContext must be called first
63+
circuitante.NewCircuitBreakerDecorator(options.CircuitKeeper),
5964
ante.NewExtensionOptionsDecorator(options.ExtensionOptionChecker),
6065
feeabsante.NewFeeAbstrationMempoolFeeDecorator(options.FeeAbskeeper),
6166
ante.NewValidateBasicDecorator(),

0 commit comments

Comments
 (0)