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
+50 −5
Merged

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

Show file tree
Hide file tree
Changes from 5 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
10 changes: 7 additions & 3 deletions contracts/contracts/ccip/fee_quoter/contract.tolk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import "../../lib/math";
import "../router/messages"
import "../ccipsend_executor/messages"

const CONTRACT_VERSION = "1.6.0";
const CONTRACT_VERSION = "1.6.1";
const RESERVE = ton("1"); // TODO: set correct value

fun onInternalMessage(in: InMessage) {
Expand Down Expand Up @@ -536,7 +536,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);
}

get fun tokenPrice(token: address): TimestampedPrice {
Expand Down Expand Up @@ -662,7 +663,10 @@ get fun reserve(): coins {
}

@method_id(1000)
fun migrate(storage: cell, version: slice): cell { throw Upgradeable_Error.VersionMismatch; }
fun migrate(storage: cell, version: slice): cell {
Copy link
Copy Markdown
Collaborator Author

@vicentevieytes vicentevieytes Apr 20, 2026

Choose a reason for hiding this comment

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

@patricios-space so here I should check that a PREVIOUS_VERSION matches the value passed in the version parameter right?

Copy link
Copy Markdown
Collaborator

@patricios-space patricios-space Apr 20, 2026

Choose a reason for hiding this comment

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

Yes! In other contracts we added const CONTRACT_VERSION_PREV = "1.6.0"; at the top of the contract.tolk file and then we assert version.bitEquals(CONTRACT_VERSION_PREV)

assert(version.bitsEqual(CONTRACT_VERSION), Upgradeable_Error.VersionMismatch);
return storage;
}

@method_id(1001)
fun version(): slice { return CONTRACT_VERSION; }
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.02");
}
5 changes: 4 additions & 1 deletion contracts/contracts/ccip/offramp/contract.tolk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,10 @@ fun onUpgrade(msg: Upgradeable_Upgrade) {
}

@method_id(1000)
fun migrate(storage: cell, version: slice): cell { throw Upgradeable_Error.VersionMismatch; }
fun migrate(storage: cell, version: slice): cell {
assert(version.bitsEqual(CONTRACT_VERSION), Upgradeable_Error.VersionMismatch);
return storage;
}

@method_id(1001)
fun version(): slice { return CONTRACT_VERSION; }
Expand Down
29 changes: 29 additions & 0 deletions contracts/tests/ccip/feequoter/FeeQuoter.updatePrices.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,35 @@ 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.01'),
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 finalBalance = (await blockchain.getContract(setup.bind.feeQuoter.address)).balance
expect(finalBalance).toEqual(initialBalance)
Copy link
Copy Markdown
Collaborator

@patricios-space patricios-space Apr 21, 2026

Choose a reason for hiding this comment

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

This is flaky as storagefee could change the balance. See

chainlink-ton/contracts/tests/ccip/Receiver.spec.ts

Line 325 in ff0a9c0

const storageFees = tx.description.storagePhase?.storageFeesCollected || toNano('0')
for the fix

})

afterAll(async () => {
if (process.env['COVERAGE'] === 'true') {
const testSuitePrefix = 'feeQuoter_update_prices_suite'
Expand Down
2 changes: 1 addition & 1 deletion contracts/wrappers/ccip/FeeQuoter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import * as upgradeable from '../libraries/versioning/Upgradeable'
import * as typeAndVersion from '../libraries/versioning/TypeAndVersion'
import * as rt from './Router'

export const FEE_QUOTER_CONTRACT_VERSION = '1.6.0'
export const FEE_QUOTER_CONTRACT_VERSION = '1.6.1'

export const FACILITY_NAME = 'link.chain.ton.ccip.FeeQuoter'
export const FACILITY_ID = facilityId(crc32(FACILITY_NAME))
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.04,
CommitPriceAndRootCostTON: 0.06,
ExecuteCostTON: 0.085,
}

Expand Down
Loading