Skip to content

fix: on-chain update prices return excess send mode #626

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

Merged
vicentevieytes merged 8 commits into from
Apr 22, 2026
Merged

fix: on-chain update prices return excess send mode #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5cbc8ad
fix updatePrices sendExcessTo send mode
vicentevieytes Feb 25, 2026
0ddf173
bump value attached to UpdatePrices
vicentevieytes Feb 25, 2026
c7eb6e9
update migrate function
vicentevieytes Feb 25, 2026
abe7d4d
bump feequoter version and fix migrate function
vicentevieytes Feb 26, 2026
4bcae80
implement migrate function for offramp
vicentevieytes Feb 26, 2026
257c9e0
Merge branch 'main' of github.com:smartcontractkit/chainlink-ton into…
vicentevieytes Apr 21, 2026
ff0a9c0
set 0.03 TON as value for updatePrices
vicentevieytes Apr 21, 2026
307afe1
substract storageFees from balance for test
vicentevieytes Apr 21, 2026
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
3 changes: 2 additions & 1 deletion contracts/contracts/ccip/fee_quoter/contract.tolk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,8 @@ fun sendExcessesTo(sendExcessesTo: address?, sender: address) {
dest: receiver,
body: createEmptyCell(),
});
returnExcesses.send(SEND_MODE_CARRY_ALL_REMAINING_MESSAGE_VALUE);
reserveToncoinsOnBalance(0, RESERVE_MODE_INCREASE_BY_ORIGINAL_BALANCE);
returnExcesses.send(SEND_MODE_CARRY_ALL_BALANCE);
Copy link
Copy Markdown
Collaborator Author

@vicentevieytes vicentevieytes Apr 24, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SEND_MODE_CARRY_ALL_REMAINING_MESSAGE_VALUE does not take into account the amount already spent for the event that is emited when processing this message. This means that a little more TON is sent than the amount is received to trigger the contract and the balance slowly drains over time.

Instead, we reserve an amount equal to the original contract balance and then try to send all of the possible TON. Because of the reserve, the contract will end up with exactly the same amount of TON as at the start and it will not drain.

}

get fun tokenPrice(token: address): TimestampedPrice {
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/ccip/fee_quoter/messages.tolk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,5 @@ fun FeeQuoter_Costs.GetValidatedFee(): int {

fun FeeQuoter_Costs.updatePrices(): int {
// when we support token transfers the message value amount should depend on the quantity of supported tokens
return ton("0.01");
return ton("0.03");
}
46 changes: 45 additions & 1 deletion contracts/tests/ccip/feequoter/FeeQuoter.updatePrices.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import '@ton/test-utils'

import { toNano } from '@ton/core'
import { Address, toNano } from '@ton/core'

import { FeeQuoterSetup } from './FeeQuoterSetup'
import * as feeQuoter from '../../../wrappers/ccip/FeeQuoter'
Expand Down Expand Up @@ -319,6 +319,50 @@ describe('FeeQuoter UpdatePrices', () => {
})
})

it('should not end up with lower balance than initial balance after returning excess', async () => {
const contract = await blockchain.getContract(setup.bind.feeQuoter.address)
const initialBalance = contract.balance

const priceUpdates: feeQuoter.PriceUpdates = {
tokenPricesUpdates: [{ token: FeeQuoterSetup.NATIVE_TON.token, price: 4000000000000000000n }],
gasPricesUpdates: [],
}

const updateResult = await setup.bind.feeQuoter.sendUpdatePrices(setup.acc.owner.getSender(), {
value: toNano('0.03'),
msg: { updates: priceUpdates, sendExcessesTo: setup.acc.deployer.address },
})

expect(updateResult.transactions).toHaveTransaction({
to: setup.bind.feeQuoter.address,
success: true,
})

expect(updateResult.transactions).toHaveTransaction({
from: setup.bind.feeQuoter.address,
to: setup.acc.deployer.address,
success: true,
})

const tx = updateResult.transactions.find(
(tx) =>
tx.inMessage &&
tx.inMessage.info.src &&
tx.inMessage.info.src instanceof Address &&
tx.inMessage.info.src.equals(setup.acc.owner.address) &&
tx.inMessage.info.dest &&
tx.inMessage.info.dest instanceof Address &&
tx.inMessage.info.dest.equals(setup.bind.feeQuoter.address),
)
if (!tx || tx.description.type != 'generic') {
throw new Error('Expected an internal message')
}
const storageFees = tx.description.storagePhase?.storageFeesCollected || toNano('0')

const finalBalance = (await blockchain.getContract(setup.bind.feeQuoter.address)).balance
expect(finalBalance).toEqual(initialBalance - storageFees)
})

afterAll(async () => {
if (process.env['COVERAGE'] === 'true') {
const testSuitePrefix = 'feeQuoter_update_prices_suite'
Expand Down
4 changes: 2 additions & 2 deletions pkg/ccip/ocr/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ type Config struct {
}

var DefaultConfigSet = Config{
CommitPriceUpdateOnlyCostTON: 0.03,
CommitPriceAndRootCostTON: 0.05,
CommitPriceUpdateOnlyCostTON: 0.05,
CommitPriceAndRootCostTON: 0.07,
ExecuteCostTON: 0.085,
}

Expand Down
Loading