revert tvm2any feeTokenAmount change (#197)

patricios-space · web-flow · commit 61041e787935 · 2025-09-19T13:49:29.000-03:00
diff --git a/contracts/contracts/ccip/onramp.tolk b/contracts/contracts/ccip/onramp.tolk
@@ -152,7 +152,7 @@ fun onMessageValidated(payload: FeeQuoter_MessageValidated<Metadata>, sender: ad
             extraArgs: msg.extraArgs,
             tokenAmounts: createEmptyCell(), // TODO:
             feeToken: msg.feeToken,
-            feeTokenAmount: payload.fee,
+            feeTokenAmount: payload.fee as uint256, // safe because it is 128 bits
         }.toCell(),
         feeValueJuels: 0, // TODO:
     };
diff --git a/contracts/contracts/ccip/types.tolk b/contracts/contracts/ccip/types.tolk
@@ -76,7 +76,7 @@ struct TVM2AnyRampMessageBody {
     extraArgs: cell;
     tokenAmounts: cell;
     feeToken: address;
-    feeTokenAmount: coins;
+    feeTokenAmount: uint256;
 }
 
 const LEAF_DOMAIN_SEPARATOR: slice = stringHexToSlice("0000000000000000000000000000000000000000000000000000000000000000");
diff --git a/pkg/ccip/bindings/ocr/executereport.go b/pkg/ccip/bindings/ocr/executereport.go
@@ -4,7 +4,6 @@ import (
 	"math/big"
 
 	"github.com/xssnick/tonutils-go/address"
-	"github.com/xssnick/tonutils-go/tlb"
 	"github.com/xssnick/tonutils-go/tvm/cell"
 
 	"github.com/smartcontractkit/chainlink-ton/pkg/ccip/bindings/common"
@@ -61,5 +60,5 @@ type TVM2AnyRampMessageBody struct {
 	ExtraArgs      *cell.Cell               `tlb:"^"`
 	TokenAmounts   *cell.Cell               `tlb:"^"` // TODO: common.SnakeRef[TVM2AnyTokenTransfer] once defined
 	FeeToken       *address.Address         `tlb:"addr"`
-	FeeTokenAmount tlb.Coins                `tlb:"."`
+	FeeTokenAmount *big.Int                 `tlb:"## 256"`
 }
diff --git a/pkg/ccip/chainaccessor/event.go b/pkg/ccip/chainaccessor/event.go
@@ -103,7 +103,7 @@ func (a *TONAccessor) convertCCIPMessageSent(
 		Receiver:       ccipocr3.UnknownAddress(tonEvent.Message.Body.Receiver),
 		ExtraArgs:      ccipocr3.Bytes(tonEvent.Message.Body.ExtraArgs.ToBOC()),
 		FeeToken:       ccipocr3.UnknownAddress(feeTokenAddr[:]),
-		FeeTokenAmount: ccipocr3.NewBigInt(tonEvent.Message.Body.FeeTokenAmount.Nano()),
+		FeeTokenAmount: ccipocr3.NewBigInt(tonEvent.Message.Body.FeeTokenAmount),
 		// TokenAmounts:   tokenAmounts, // TODO: enable token transfer
 	}
 	genericEvent := &chainaccessor.SendRequestedEvent{

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ struct TVM2AnyRampMessageBody {`
`76`	`76`	`extraArgs: cell;`
`77`	`77`	`tokenAmounts: cell;`
`78`	`78`	`feeToken: address;`
`79`		`- feeTokenAmount: coins;`
	`79`	`+ feeTokenAmount: uint256;`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`const LEAF_DOMAIN_SEPARATOR: slice = stringHexToSlice("0000000000000000000000000000000000000000000000000000000000000000");`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ func (a *TONAccessor) convertCCIPMessageSent(`
`103`	`103`	`Receiver: ccipocr3.UnknownAddress(tonEvent.Message.Body.Receiver),`
`104`	`104`	`ExtraArgs: ccipocr3.Bytes(tonEvent.Message.Body.ExtraArgs.ToBOC()),`
`105`	`105`	`FeeToken: ccipocr3.UnknownAddress(feeTokenAddr[:]),`
`106`		`- FeeTokenAmount: ccipocr3.NewBigInt(tonEvent.Message.Body.FeeTokenAmount.Nano()),`
	`106`	`+ FeeTokenAmount: ccipocr3.NewBigInt(tonEvent.Message.Body.FeeTokenAmount),`
`107`	`107`	`// TokenAmounts: tokenAmounts, // TODO: enable token transfer`
`108`	`108`	`}`
`109`	`109`	`genericEvent := &chainaccessor.SendRequestedEvent{`