Skip to content

Commit 6efae9e

Browse files
milapshethmilapsheth
committed
rename TransferRate to TransferEpoch
1 parent dd93d2a commit 6efae9e

25 files changed

+370
-367
lines changed

‎client/docs/static/openapi/index.html

+3-3
Large diffs are not rendered by default.

‎client/docs/static/openapi/openapi.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -8031,7 +8031,7 @@ paths:
80318031
- MsgService
80328032
/axelar/nexus/set_transfer_rate_limit:
80338033
post:
8034-
operationId: SetTransferRateLimit
8034+
operationId: SetTransferEpochLimit
80358035
responses:
80368036
"200":
80378037
description: A successful response.
@@ -8237,7 +8237,7 @@ paths:
82378237
window:
82388238
type: string
82398239
title: >-
8240-
SetTransferRateLimitRequest represents a message to set rate
8240+
SetTransferEpochLimitRequest represents a message to set rate
82418241
limits on
82428242

82438243
transfers
@@ -38388,7 +38388,7 @@ components:
3838838388
type: string
3838938389
axelar.nexus.v1beta1.RegisterChainMaintainerResponse:
3839038390
type: object
38391-
axelar.nexus.v1beta1.SetTransferRateLimitRequest:
38391+
axelar.nexus.v1beta1.SetTransferEpochLimitRequest:
3839238392
type: object
3839338393
properties:
3839438394
sender:
@@ -38411,9 +38411,9 @@ components:
3841138411
window:
3841238412
type: string
3841338413
title: |-
38414-
SetTransferRateLimitRequest represents a message to set rate limits on
38414+
SetTransferEpochLimitRequest represents a message to set rate limits on
3841538415
transfers
38416-
axelar.nexus.v1beta1.SetTransferRateLimitResponse:
38416+
axelar.nexus.v1beta1.SetTransferEpochLimitResponse:
3841738417
type: object
3841838418
axelar.nexus.v1beta1.TransferFeeResponse:
3841938419
type: object

‎client/docs/static/swagger/swagger.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -8843,7 +8843,7 @@ paths:
88438843
- MsgService
88448844
/axelar/nexus/set_transfer_rate_limit:
88458845
post:
8846-
operationId: SetTransferRateLimit
8846+
operationId: SetTransferEpochLimit
88478847
responses:
88488848
'200':
88498849
description: A successful response.
@@ -9071,7 +9071,7 @@ paths:
90719071
window:
90729072
type: string
90739073
title: >-
9074-
SetTransferRateLimitRequest represents a message to set rate
9074+
SetTransferEpochLimitRequest represents a message to set rate
90759075
limits on
90769076

90779077
transfers
@@ -41597,7 +41597,7 @@ definitions:
4159741597
type: string
4159841598
axelar.nexus.v1beta1.RegisterChainMaintainerResponse:
4159941599
type: object
41600-
axelar.nexus.v1beta1.SetTransferRateLimitRequest:
41600+
axelar.nexus.v1beta1.SetTransferEpochLimitRequest:
4160141601
type: object
4160241602
properties:
4160341603
sender:
@@ -41620,9 +41620,9 @@ definitions:
4162041620
window:
4162141621
type: string
4162241622
title: |-
41623-
SetTransferRateLimitRequest represents a message to set rate limits on
41623+
SetTransferEpochLimitRequest represents a message to set rate limits on
4162441624
transfers
41625-
axelar.nexus.v1beta1.SetTransferRateLimitResponse:
41625+
axelar.nexus.v1beta1.SetTransferEpochLimitResponse:
4162641626
type: object
4162741627
axelar.nexus.v1beta1.TransferFeeResponse:
4162841628
type: object

‎client/docs/statik/statik.go

+1-1
Large diffs are not rendered by default.

‎docs/proto/proto-docs.md

+12-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎proto/axelar/nexus/v1beta1/genesis.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ message GenesisState {
2525
repeated nexus.exported.v1beta1.FeeInfo fee_infos = 8
2626
[ (gogoproto.nullable) = false ];
2727
repeated RateLimit rate_limits = 9 [ (gogoproto.nullable) = false ];
28-
repeated TransferRate transfer_rates = 10 [ (gogoproto.nullable) = false ];
28+
repeated TransferEpoch transfer_epochs = 10 [ (gogoproto.nullable) = false ];
2929
}

‎proto/axelar/nexus/v1beta1/service.proto

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ service MsgService {
5151
};
5252
}
5353

54-
rpc SetTransferRateLimit(SetTransferRateLimitRequest)
55-
returns (SetTransferRateLimitResponse) {
54+
rpc SetTransferEpochLimit(SetTransferEpochLimitRequest)
55+
returns (SetTransferEpochLimitResponse) {
5656
option (google.api.http) = {
5757
post : "/axelar/nexus/set_transfer_rate_limit"
5858
body : "*"

‎proto/axelar/nexus/v1beta1/tx.proto

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ message RegisterAssetFeeRequest {
6969

7070
message RegisterAssetFeeResponse {}
7171

72-
// SetTransferRateLimitRequest represents a message to set rate limits on
72+
// SetTransferEpochLimitRequest represents a message to set rate limits on
7373
// transfers
74-
message SetTransferRateLimitRequest {
74+
message SetTransferEpochLimitRequest {
7575
option (permission.exported.v1beta1.permission_role) = ROLE_ACCESS_CONTROL;
7676

7777
bytes sender = 1 [ (gogoproto.casttype) =
@@ -84,4 +84,4 @@ message SetTransferRateLimitRequest {
8484
[ (gogoproto.stdduration) = true, (gogoproto.nullable) = false ];
8585
}
8686

87-
message SetTransferRateLimitResponse {}
87+
message SetTransferEpochLimitResponse {}

‎proto/axelar/nexus/v1beta1/types.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ message RateLimit {
5353
[ (gogoproto.stdduration) = true, (gogoproto.nullable) = false ];
5454
}
5555

56-
message TransferRate {
56+
message TransferEpoch {
5757
string chain = 1
5858
[ (gogoproto.casttype) =
5959
"github.com/axelarnetwork/axelar-core/x/nexus/exported.ChainName" ];

‎x/nexus/client/cli/tx.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func GetTxCmd() *cobra.Command {
3131
GetCmdActivateChain(),
3232
GetCmdDeactivateChain(),
3333
GetCmdRegisterAssetFee(),
34-
GetCmdSetTransferRateLimit(),
34+
GetCmdSetTransferEpochLimit(),
3535
)
3636

3737
return txCmd
@@ -181,8 +181,8 @@ func GetCmdRegisterAssetFee() *cobra.Command {
181181
return cmd
182182
}
183183

184-
// GetCmdSetTransferRateLimit returns the cli command to register asset transfer rate limit for a chain
185-
func GetCmdSetTransferRateLimit() *cobra.Command {
184+
// GetCmdSetTransferEpochLimit returns the cli command to register asset transfer rate limit for a chain
185+
func GetCmdSetTransferEpochLimit() *cobra.Command {
186186
cmd := &cobra.Command{
187187
Use: "set-transfer-rate-limit [chain] [limit] [window]",
188188
Short: "set transfer rate limit for an asset on a chain",
@@ -203,7 +203,7 @@ func GetCmdSetTransferRateLimit() *cobra.Command {
203203
return err
204204
}
205205

206-
msg := types.NewSetTransferRateLimitRequest(cliCtx.GetFromAddress(), exported.ChainName(args[0]), limit, window)
206+
msg := types.NewSetTransferEpochLimitRequest(cliCtx.GetFromAddress(), exported.ChainName(args[0]), limit, window)
207207
if err := msg.ValidateBasic(); err != nil {
208208
return err
209209
}

‎x/nexus/handler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ func NewHandler(k types.Nexus, snapshotter types.Snapshotter, slashing types.Sla
3131
case *types.RegisterAssetFeeRequest:
3232
res, err := server.RegisterAssetFee(sdk.WrapSDKContext(ctx), msg)
3333
return sdk.WrapServiceResult(ctx, res, err)
34-
case *types.SetTransferRateLimitRequest:
35-
res, err := server.SetTransferRateLimit(sdk.WrapSDKContext(ctx), msg)
34+
case *types.SetTransferEpochLimitRequest:
35+
res, err := server.SetTransferEpochLimit(sdk.WrapSDKContext(ctx), msg)
3636
return sdk.WrapServiceResult(ctx, res, err)
3737
default:
3838
return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest,

‎x/nexus/keeper/genesis.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,16 @@ func (k Keeper) InitGenesis(ctx sdk.Context, genState *types.GenesisState) {
7979
funcs.MustNoErr(k.SetRateLimit(ctx, rateLimit.Chain, rateLimit.Limit, rateLimit.Window))
8080
}
8181

82-
for _, transferRate := range genState.TransferRates {
83-
if _, ok := k.GetChain(ctx, transferRate.Chain); !ok {
84-
panic(fmt.Errorf("chain %s not found", transferRate.Chain))
82+
for _, transferEpoch := range genState.TransferEpochs {
83+
if _, ok := k.GetChain(ctx, transferEpoch.Chain); !ok {
84+
panic(fmt.Errorf("chain %s not found", transferEpoch.Chain))
8585
}
8686

87-
if _, found := k.getTransferRate(ctx, transferRate.Chain, transferRate.Amount.Denom, transferRate.Direction); found {
88-
panic(fmt.Errorf("transfer rate for chain %s (%s) and asset %s already registered", transferRate.Chain, transferRate.Direction, transferRate.Amount.Denom))
87+
if _, found := k.getTransferEpoch(ctx, transferEpoch.Chain, transferEpoch.Amount.Denom, transferEpoch.Direction); found {
88+
panic(fmt.Errorf("transfer rate for chain %s (%s) and asset %s already registered", transferEpoch.Chain, transferEpoch.Direction, transferEpoch.Amount.Denom))
8989
}
9090

91-
k.setTransferRate(ctx, transferRate)
91+
k.setTransferEpoch(ctx, transferEpoch)
9292
}
9393
}
9494

@@ -104,6 +104,6 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
104104
k.getTransferFee(ctx),
105105
k.getFeeInfos(ctx),
106106
k.getRateLimits(ctx),
107-
k.getTransferRates(ctx),
107+
k.getTransferEpochs(ctx),
108108
)
109109
}

‎x/nexus/keeper/genesis_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func assertChainStatesEqual(t *testing.T, expected, actual *types.GenesisState)
8383
assert.ElementsMatch(t, expected.FeeInfos, actual.FeeInfos)
8484
assert.ElementsMatch(t, expected.RateLimits, actual.RateLimits)
8585
// TODO: Track this with some random transfers
86-
// assert.ElementsMatch(t, expected.TransferRates, actual.TransferRates)
86+
// assert.ElementsMatch(t, expected.TransferEpochs, actual.TransferEpochs)
8787
}
8888

8989
func TestExportGenesisInitGenesis(t *testing.T) {

‎x/nexus/keeper/keeper.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ var (
2525
assetFeePrefix = utils.KeyFromStr("asset_fee")
2626
chainMaintainerStatePrefix = key.FromUInt[uint64](1)
2727
rateLimitPrefix = key.FromUInt[uint64](2)
28-
transferRatePrefix = key.FromUInt[uint64](3)
28+
transferEpochPrefix = key.FromUInt[uint64](3)
2929

3030
// temporary
3131
latestDepositAddressPrefix = utils.KeyFromStr("latest_deposit_address")

‎x/nexus/keeper/msg_server.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -263,13 +263,13 @@ func (s msgServer) RegisterAssetFee(c context.Context, req *types.RegisterAssetF
263263
return &types.RegisterAssetFeeResponse{}, nil
264264
}
265265

266-
// SetTransferRateLimit handles setting the transfer rate limit for an asset on a chain
267-
func (s msgServer) SetTransferRateLimit(c context.Context, req *types.SetTransferRateLimitRequest) (*types.SetTransferRateLimitResponse, error) {
266+
// SetTransferEpochLimit handles setting the transfer rate limit for an asset on a chain
267+
func (s msgServer) SetTransferEpochLimit(c context.Context, req *types.SetTransferEpochLimitRequest) (*types.SetTransferEpochLimitResponse, error) {
268268
ctx := sdk.UnwrapSDKContext(c)
269269

270270
if err := s.SetRateLimit(ctx, req.Chain, req.Limit, req.Window); err != nil {
271271
return nil, err
272272
}
273273

274-
return &types.SetTransferRateLimitResponse{}, nil
274+
return &types.SetTransferEpochLimitResponse{}, nil
275275
}

0 commit comments

Comments
 (0)