Skip to content

fix(migration): reject battery gas_payer for v3/v4 source wallets #947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hsslbchtop wants to merge 1 commit into from
Closed

fix(migration): reject battery gas_payer for v3/v4 source wallets #947

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions pkg/api/migration_handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,9 @@ func (h *Handler) PrepareMigration(ctx context.Context, req *oas.MigrationPrepar
logger.Error("error happened on wallet inference", slog.String("error", err.Error()))
return nil, err
}
if gaslessPays && !sourceWallet.IsRelaySupported() {
return nil, toError(http.StatusBadRequest, fmt.Errorf("gasless migration requires a v5 source wallet; use gas_payer=battery or self"))
// both relayed modes need owner-signed internal messages, which only v5 supports
if (gaslessPays || batteryPays) && !sourceWallet.IsRelaySupported() {
return nil, toError(http.StatusBadRequest, fmt.Errorf("%v migration requires a v5 source wallet; use gas_payer=self", gasPayer))
}
var gasJettonMaster *ton.AccountID
if gaslessPays {
Expand All @@ -311,8 +312,8 @@ func (h *Handler) PrepareMigration(ctx context.Context, req *oas.MigrationPrepar
return nil, toError(http.StatusBadRequest, err)
}
}
// todo allow battery for v4 and v3
relayFunded := (batteryPays || gaslessPays) && sourceWallet.IsRelaySupported()
// todo allow battery for v4 and v3 by pre-funding the source instead of relaying
relayFunded := batteryPays || gaslessPays
var gramBalance tlb.Grams
if currColl, ok := sourceAccount.Account.CurrencyCollection(); ok {
gramBalance = currColl.Grams
Expand Down
Loading