Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions sdk/action/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,11 @@ func (c *ClientImpl) BuildCascadeMetadataFromFile(ctx context.Context, filePath
denom := paramsResp.Params.BaseActionFee.Denom
exp := paramsResp.Params.ExpirationDuration

// Compute data size in KB for fee
kb := int(fi.Size()) / 1024
feeResp, err := c.lumeraClient.GetActionFee(ctx, strconv.Itoa(kb))
// Compute data size in KB for fee, rounding up to avoid underpaying
// Keep consistent with supernode verification which uses ceil(bytes/1024)
sizeBytes := fi.Size()
kb := (sizeBytes + 1023) / 1024 // int64 division
feeResp, err := c.lumeraClient.GetActionFee(ctx, strconv.FormatInt(kb, 10))
if err != nil {
return actiontypes.CascadeMetadata{}, "", "", fmt.Errorf("get action fee: %w", err)
}
Expand Down
17 changes: 10 additions & 7 deletions supernode/cascade/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -195,13 +195,16 @@ func (task *CascadeRegistrationTask) verifyActionFee(ctx context.Context, action
}
requiredFee := sdk.NewCoin("ulume", math.NewInt(amount))
logtrace.Debug(ctx, "calculated required fee", logtrace.Fields{"fee": requiredFee.String(), "dataBytes": dataSize})
if action.Price == nil || action.Price.String() != requiredFee.String() {
got := "<nil>"
if action.Price != nil {
got = action.Price.String()
}
return task.wrapErr(ctx, "insufficient fee", errors.Errorf("expected at least %s, got %s", requiredFee.String(), got), fields)
// Accept paying more than the minimum required fee. Only enforce denom match and Amount >= required.
if action.Price == nil {
return task.wrapErr(ctx, "insufficient fee", errors.Errorf("expected at least %s, got <nil>", requiredFee.String()), fields)
}
if action.Price.Denom != requiredFee.Denom {
return task.wrapErr(ctx, "invalid fee denom", errors.Errorf("expected denom %s, got %s", requiredFee.Denom, action.Price.Denom), fields)
}
if action.Price.Amount.LT(requiredFee.Amount) {
return task.wrapErr(ctx, "insufficient fee", errors.Errorf("expected at least %s, got %s", requiredFee.String(), action.Price.String()), fields)
}
logtrace.Info(ctx, "register: verify action fee ok", logtrace.Fields{"required_fee": requiredFee.String()})
logtrace.Info(ctx, "register: verify action fee ok", logtrace.Fields{"required_fee": requiredFee.String(), "provided_fee": action.Price.String()})
return nil
}