TokenAdminRegistry by vicentevieytes · Pull Request #857 · smartcontractkit/chainlink-ton

vicentevieytes · 2026-08-26T14:20:41Z

No description provided.

vicentevieytes · 2026-09-02T14:17:49Z

 struct OffRamp_Deployables {
    rmnRouter: address;
+    // Separate TokenAdminRegistry root used to derive deterministic entries.
+    tokenAdminRegistry: address;


Probably doesn't make sense to have this both here and in Config

I agree this belongs only to the static config

Oh, I see there's no StaticConfig struct. Why though?

It's just the way we implemented this originally, I'm not sure there's a reason beyond that

duck-types · 2026-09-02T21:40:23Z

 struct (0xaf3c62b3) CCIPSendExecutor_Execute {
    onrampSend: OnRamp_Send,
+    // Derived by the OnRamp rather than supplied by the Router.
+    tokenRegistry: address?,


I'd put it in Config together with all the other addresses

…sfer (#838)

* feat: overflow static analyzer * ref: move shared toml.ts lib * feat: run with nix * feat: add type notation * fix: fmt and wrong file * fix: comments

* Add TP <> ContextExecutor integration to support async flow continuation * Stash current behaviour - throw on error in transfer continuation * Lock or burn transfer error handling and return * LockReleaseLockboxTokenPool use ContextExecutor vs. local st * yarn fmt * Fix lint * Update Go bindings * Share code in TP lib + docs * CE - wait for deploy confirmation before continuation * Fix golangci-lint * Remove local review * Add TODOs for forwardTonAmount * Migrate CE to OffRampAccount to support async flow * Fix lock_release & lockbox flow * Embed AskToTransfer in oa withdraw, check msg.transferInitiator == null on mint * Document OffRampAccount contract * TP compose consumeIn/OutboundRateLimit functions * Replace CE on burn_mint burn path with CCT burn flow fwdPayload * Fix oplint * rm tests/debug_cells.test.ts * Add OnRampAccount + handle TP deposit auth * Improve TP error handling - return transfer * PR feedback - missing lazy * Fix lint * Fix test

* Add TP <> ContextExecutor integration to support async flow continuation * Stash current behaviour - throw on error in transfer continuation * Lock or burn transfer error handling and return * LockReleaseLockboxTokenPool use ContextExecutor vs. local st * yarn fmt * Fix lint * Update Go bindings * Share code in TP lib + docs * CE - wait for deploy confirmation before continuation * Fix golangci-lint * Remove local review * Add TODOs for forwardTonAmount * Migrate CE to OffRampAccount to support async flow * Fix lock_release & lockbox flow * Embed AskToTransfer in oa withdraw, check msg.transferInitiator == null on mint * Document OffRampAccount contract * TP compose consumeIn/OutboundRateLimit functions * Replace CE on burn_mint burn path with CCT burn flow fwdPayload * Fix oplint * rm tests/debug_cells.test.ts * Add OnRampAccount + handle TP deposit auth * Improve TP error handling - return transfer * PR feedback - missing lazy * DepositAccount contract for on/off-ramp escrows * Remove DepositAccount allowedJettonWallet * Fix lint * DepositAccount Go bindings * Simplify deposit acc bounce handling * Post merge fix - rm accounts/off_ramp_account * Remove ContextExecutor contract - replaced with deposit acc * Update Go bindings and add TP contracts to pkg archive * Fix Go bindings - exit codes * Update pool FQN and exit codes * Fix exit codes

* feat: use LockRelease TokenPool for tests * fix: go tests and deployment sequences * fix: missing Pools in the generator script * fix: DepositAccount code missing from Token Pool * fix: pin ton version

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

…851) * fix: DefaultTokenDestGasOverhead * fix: fund LockRelease Token Pool * fix: golint * feat: fetch DepositAccount from TP * fix: missmatch in Any2TVMTokenTransfer go binding * doc: TODO missing gap * fix: Execute amount didn't account for TokenTransfer flow * fix: extractDestGasAmountFromMap should handle int64 * fix: update DefaultTokenDestGasOverhead * fix: offramp missing from TokenPool config * fix: broken TokenPool funding * DataStore was outdated * error finding TP in Datastore was ignored * Missing wait and check after minting * fix: raise forwardTonAmount on offRamp account notification * fix: ExtraData is optional * fix: nix hash * test: updated gas calculation in transmiter * fix: OffRamp_DispatchValidated value too low * chore: bump imports to chainlink-ccip/deployment * chore: bump imports to chainlink-ccip/deployment * fix: unpin ton version * fix: breaking change * fix: ping ugorji/go/codec version * fix: mock UltraFastCurseMCMS

* fix: remove local replace for cciplib * fix: nix hash * fix: remove env var guard on token transfer config and pool funding * fix: bump to latest in feat/e2e-ton-as-dest

* Resolve loader relative paths via CWD * Remove stale test * Update .core_version - long running branch, build fix * Bump ContractsPackageLatestSupported to contracts/1.6.2

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix lodash & protobufjs * update lock.nix * fixes * Update to nixpkgs >= 26.11, drop x86_64-darwin support * lint * fix lint * nix * nix * nix * nix * nix * mockery --------- Co-authored-by: Kristijan <kristijan.rebernisak@gmail.com>

duck-types

Great PR. I'd rather pass through the TokenAdminRegistry contract for ownership changes. That way, we can change how the checks are applied, for future implementation of self registration.

duck-types · 2026-09-07T17:40:17Z

 struct OffRamp_Deployables {
    rmnRouter: address;
+    // Separate TokenAdminRegistry root used to derive deterministic entries.
+    tokenAdminRegistry: address;


I agree this belongs only to the static config

duck-types · 2026-09-07T17:42:19Z

 struct OffRamp_Deployables {
    rmnRouter: address;
+    // Separate TokenAdminRegistry root used to derive deterministic entries.
+    tokenAdminRegistry: address;


Oh, I see there's no StaticConfig struct. Why though?

duck-types · 2026-09-07T17:48:30Z

+// ownership state changes such as a pending owner.
+struct OnRamp_DeployablesConfig {
+    executor: ExecutorDeployment;
+    tokenAdminRegistry: address;


Why don't you use OnRamp_DynamicConfig? It already holds feeQuoter ande feeAggregator. I don't think deployable is the right name because the OnRamp is not deploying the tokenAdminRegistry. It's for authorization checks.

Yeah but I still need to use the Deployable code to calculate the adderss of the TokenAdminRegistry entry.

I didn't like that I had to access the ExecutorDeployment struct to get the Deployable code to get the address of something completely unrelated to the Executor.

Tbh, I think this is just a temporary thing. I really want us to move to inlined instead of stored code cells for sub-contracts and I was planning on picking that up as a follow-up for this work

refactor in progress to inline all deployable contract dependencies: #873

duck-types · 2026-09-07T18:00:21Z

+    administrator: address?
+    pendingAdministrator: address?


Why not use Ownable2Step instead?

duck-types · 2026-09-07T18:24:31Z

+    newAdministrator: address?
+}
+
+struct (0xd1fbd97c) TokenAdminRegistryEntry_AcceptAdminRole {}


Proposal:

Add queryIDs to all messages for easier traceability.

the on<MessageName>() handlers in contract.tolk should always receive the message, even if it doesn't have data. It makes it easier to navigate the code. When you search for references of the message type, you can find the message handler directly, instead of going through the match.

duck-types · 2026-09-07T18:28:34Z

@@ -0,0 +1,51 @@
+import "types"
+
+type TokenAdminRegistryEntry_InMessage =


Shall we add SetEnabled(enabled: bool) message?

* Add TP <> ContextExecutor integration to support async flow continuation * Stash current behaviour - throw on error in transfer continuation * Lock or burn transfer error handling and return * LockReleaseLockboxTokenPool use ContextExecutor vs. local st * yarn fmt * Fix lint * Update Go bindings * Share code in TP lib + docs * CE - wait for deploy confirmation before continuation * Fix golangci-lint * Remove local review * Add TODOs for forwardTonAmount * Migrate CE to OffRampAccount to support async flow * Fix lock_release & lockbox flow * Embed AskToTransfer in oa withdraw, check msg.transferInitiator == null on mint * Document OffRampAccount contract * TP compose consumeIn/OutboundRateLimit functions * Replace CE on burn_mint burn path with CCT burn flow fwdPayload * Fix oplint * rm tests/debug_cells.test.ts * Add OnRampAccount + handle TP deposit auth * Improve TP error handling - return transfer * PR feedback - missing lazy * DepositAccount contract for on/off-ramp escrows * Remove DepositAccount allowedJettonWallet * Fix lint * DepositAccount Go bindings * Simplify deposit acc bounce handling * Add withdrawable fee jettons via JettonWithdrawable * Fix lint * Add Go bindings + tlbe.Array * Polish docs and fix lint * Remove CE files post merge, polish * Polish + rm unused compilation targets * Fix lock/release tp fee withdrawal + Go bindings * Add proper isZeroAddress check * Fix withdrawable maxAmount checks * Improve value check onWithdraw via reserve * Add Jetton_ForwardPayloadWrap, used by JettonWithdrawable * Remove duplicated field - ctx.withdrawInitiator * PR feedback + polish * Fix oplint * Fix Go binding - lock/release storage

… vv/TokenAdminRegistry

vicentevieytes · 2026-09-07T23:11:06Z

 //     participant ReceiveExecutor

-//     Receiver        ->> Router:          Receiver_CCIPReceiveV2 (bounce)
+//     Receiver        ->> Router:          Receiver_CCIPReceive (bounce)


Merged incorrectly, i'll stick to CCIPReceiveV2

vicentevieytes changed the title ~~logpoller backfill~~ TokenAdminRegistry Aug 26, 2026

vicentevieytes added 2 commits August 26, 2026 12:34

Add token_admin_registry parent contract

35d05b4

outline propose/accept admin access control

39f16f8

vicentevieytes force-pushed the vv/TokenAdminRegistry branch from 61c90bd to 39f16f8 Compare August 26, 2026 15:34

vicentevieytes added 6 commits August 27, 2026 11:38

CCIP owner registration/ two-step admin lifecycle

1e8ac3a

registration should be idempotent, events should be emitted by root

93de219

decouple TokenAdminRegistry from the Router

f2bd6d2

rename messages to correct prefix, add version to tokenInfo

0ab4b96

fix all existing test-suites after latest changes

401c0ec

add tokenAdminRegistry.spec.ts test suite

ab119fd

vicentevieytes commented Sep 2, 2026

View reviewed changes

Comment thread contracts/contracts/ccip/ccipsend_executor/messages.tolk Outdated

vicentevieytes commented Sep 2, 2026

View reviewed changes

Comment thread contracts/contracts/ccip/onramp/contract.tolk Outdated

duck-types reviewed Sep 4, 2026

View reviewed changes

refactor onramp storage + off-chain bindings/deploy

37ec619

vicentevieytes marked this pull request as ready for review September 7, 2026 13:34

vicentevieytes requested a review from a team as a code owner September 7, 2026 13:34

vicentevieytes and others added 13 commits September 7, 2026 10:52

Update contracts/contracts/ccip/ccipsend_executor/messages.tolk

7699856

ref: simplify internal messages and logic to handle single token tran…

c827b5f

…sfer (#838)

[NONEVM-5607] Overflow Static Analyzer (#802)

95d1d66

* feat: overflow static analyzer * ref: move shared toml.ts lib * feat: run with nix * feat: add type notation * fix: fmt and wrong file * fix: comments

dependabump: update hashes (#856)

2e82d97

nix: move acton and mkTsScriptApp to closure (#859)

54caa0b

[NONEVM-5813] Delete mock Token Pool contract (#840)

c9201c4

* feat: use LockRelease TokenPool for tests * fix: go tests and deployment sequences * fix: missing Pools in the generator script * fix: DepositAccount code missing from Token Pool * fix: pin ton version

dependabump (#853)

e0c0fe5

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

[NONEVM-5812] Run the e2e devenv test with TON as dest (#858)

96121a8

* fix: remove local replace for cciplib * fix: nix hash * fix: remove env var guard on token transfer config and pool funding * fix: bump to latest in feat/e2e-ton-as-dest

Resolve contracts pkg relative paths via CWD (#870)

2012013

* Resolve loader relative paths via CWD * Remove stale test * Update .core_version - long running branch, build fix * Bump ContractsPackageLatestSupported to contracts/1.6.2

bump dependencies (#863)

d7b6133

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

[WIP] Fix lodash & protobufjs (#861)

3eed4fc

* fix lodash & protobufjs * update lock.nix * fixes * Update to nixpkgs >= 26.11, drop x86_64-darwin support * lint * fix lint * nix * nix * nix * nix * nix * mockery --------- Co-authored-by: Kristijan <kristijan.rebernisak@gmail.com>

duck-types requested changes Sep 7, 2026

View reviewed changes

krebernisak and others added 2 commits September 7, 2026 15:34

Merge branch 'main' of github.com:smartcontractkit/chainlink-ton into…

da814d8

… vv/TokenAdminRegistry

vicentevieytes commented Sep 7, 2026

View reviewed changes

vicentevieytes added 3 commits September 7, 2026 20:52

applied simple PR comments

6a05856

fix missing event topics, revert rename

a81a37b

move tokenRegistry into CCIPSendExecutor_Config

1855579

		@@ -0,0 +1,51 @@
		import "types"

		type TokenAdminRegistryEntry_InMessage =

Uh oh!

Conversation

vicentevieytes commented Aug 26, 2026

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

duck-types left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vicentevieytes Sep 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

vicentevieytes Sep 7, 2026 •

edited

Loading